Scroll custom columns config, bump versions.

Add extracategories, etc, Relationships, another Mac fix, fix for & in tags.
Allows different skins for stories that require login
2026-09-15 11:36:30 +08:00 · 2012-09-06 17:23:25 -05:00 · 2012-09-05 12:20:35 -05:00 · 2012-08-28 19:46:50 -04:00 · 2012-08-27 12:14:01 -05:00 · 2012-08-27 12:13:31 -05:00
65 changed files with 767 additions and 356 deletions
@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanfictiondownloader
 application: fanfictiondownloader
-version: 4-4-23
+version: 4-4-24
 runtime: python27
 api_version: 1
 threadsafe: true
@@ -27,7 +27,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
    description         = 'UI plugin to download FanFiction stories from various sites.'
    supported_platforms = ['windows', 'osx', 'linux']
    author              = 'Jim Miller'
-    version             = (1, 6, 5)
+    version             = (1, 6, 8)
    minimum_calibre_version = (0, 8, 57)

    #: This field defines the GUI plugin class that contains all the code
@@ -715,6 +715,7 @@ permitted_values = {
                     'language',
                     'series',
                     'characters',
+                     'ships',
                     'status',
                     'datePublished',
                     'dateUpdated',
@@ -751,6 +752,7 @@ titleLabels = {
    'status-I':'Status:In-Progress',
    'series':'Series',
    'characters':'Characters',
+    'ships':'Relationships',
    'datePublished':'Published',
    'dateUpdated':'Updated',
    'dateCreated':'Packaged',
@@ -793,6 +795,15 @@ class CustomColumnsTab(QWidget):
        self.custcol_dropdowns = {}
        self.custcol_newonlycheck = {}

+        scrollable = QScrollArea()
+        scrollcontent = QWidget()
+        scrollable.setWidget(scrollcontent)
+        scrollable.setWidgetResizable(True)
+        self.l.addWidget(scrollable)
+
+        self.sl = QVBoxLayout()
+        scrollcontent.setLayout(self.sl)
+        
        for key, column in custom_columns.iteritems():

            if column['datatype'] in permitted_values:
@@ -823,9 +834,9 @@ class CustomColumnsTab(QWidget):
                    newonlycheck.setChecked(prefs['custom_cols_newonly'][key])
                horz.addWidget(newonlycheck)
                
-                self.l.addLayout(horz)
+                self.sl.addLayout(horz)
        
-        self.l.insertStretch(-1)
+        self.sl.insertStretch(-1)

        self.l.addSpacing(5)
        label = QLabel("Special column:")
@@ -847,8 +858,7 @@ class CustomColumnsTab(QWidget):
        self.errorcol.setCurrentIndex(self.errorcol.findData(QVariant(prefs['errorcol'])))
        horz.addWidget(self.errorcol)
        self.l.addLayout(horz)
-        
-        
+
        #print("prefs['custom_cols'] %s"%prefs['custom_cols'])


@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2012, Jim Miller'
 __docformat__ = 'restructuredtext en'

-import time, os, copy, threading, re
+import time, os, copy, threading, re, platform
 from ConfigParser import SafeConfigParser
 from StringIO import StringIO
 from functools import partial
@@ -143,8 +143,6 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
                                                       triggered=self.add_dialog )

            self.update_action = self.create_menu_item_ex(self.menu, '&Update Existing FanFiction Book(s)', image='plusplus.png',
-                                                          unique_name='Update Existing FanFiction Book(s)',
-                                                          shortcut_name='Update Existing FanFiction Book(s)',
                                                          triggered=self.update_existing)

            if 'Reading List' in self.gui.iactions and (prefs['addtolists'] or prefs['addtoreadlists']) :
@@ -164,37 +162,34 @@ class FanFictionDownLoaderPlugin(InterfaceAction):

                if addmenutxt:
                    self.add_send_action = self.create_menu_item_ex(self.menu, addmenutxt, image='plusplus.png',
-                                                                    unique_name=addmenutxt,
-                                                                    shortcut_name=addmenutxt,
                                                                    triggered=partial(self.update_lists,add=True))

                if rmmenutxt:
                    self.add_remove_action = self.create_menu_item_ex(self.menu, rmmenutxt, image='minusminus.png',
-                                                                      unique_name=rmmenutxt,
-                                                                      shortcut_name=rmmenutxt,
                                                                      triggered=partial(self.update_lists,add=False))
                
            self.menu.addSeparator()
            self.get_list_action = self.create_menu_item_ex(self.menu, 'Get URLs from Selected Books', image='bookmarks.png',
-                                                            unique_name='Get URLs from Selected Books',
-                                                            shortcut_name='Get URLs from Selected Books',
                                                            triggered=self.get_list_urls)

            self.get_list_url_action = self.create_menu_item_ex(self.menu, 'Get Story URLs from Web Page', image='view.png',
-                                                                unique_name='Get Story URLs from Web Page',
-                                                                shortcut_name='Get Story URLs from Web Page',
                                                                triggered=self.get_urls_from_page)

-            self.menu.addSeparator()
-            self.config_action = create_menu_action_unique(self, self.menu, '&Configure Plugin', shortcut=False,
-                                                           image= 'config.png',
-                                                           unique_name='Configure FanFictionDownLoader',
-                                                           triggered=partial(do_user_config,parent=self.gui))
+            # print("platform.system():%s"%platform.system())
+            # print("platform.mac_ver()[0]:%s"%platform.mac_ver()[0])
+            if not platform.mac_ver()[0]: # Some macs crash on these menu items for unknown reasons.
+                self.menu.addSeparator()
+                self.config_action = self.create_menu_item_ex(self.menu, '&Configure Plugin',
+                                                              image= 'config.png',
+                                                              unique_name='Configure FanFictionDownLoader',
+                                                              shortcut_name='Configure FanFictionDownLoader',
+                                                              triggered=partial(do_user_config,parent=self.gui))
            
-            self.about_action = create_menu_action_unique(self, self.menu, 'About Plugin', shortcut=False,
-                                                          image= 'images/icon.png',
-                                                          unique_name='About FanFictionDownLoader',
-                                                          triggered=self.about)
+                self.about_action = self.create_menu_item_ex(self.menu, 'About Plugin',
+                                                             image= 'images/icon.png',
+                                                             unique_name='About FanFictionDownLoader', 
+                                                             shortcut_name='About FanFictionDownLoader', 
+                                                             triggered=self.about)
            
            # Before we finalize, make sure we delete any actions for menus that are no longer displayed
            for menu_id, unique_name in self.old_actions_unique_map.iteritems():
@@ -220,12 +215,12 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
    def create_menu_item_ex(self, parent_menu, menu_text, image=None, tooltip=None,
                           shortcut=None, triggered=None, is_checked=None, shortcut_name=None,
                           unique_name=None):
-        #print("create_menu_item_ex before %s"%unique_name)
+        #print("create_menu_item_ex before %s"%menu_text)
        ac = create_menu_action_unique(self, parent_menu, menu_text, image, tooltip,
                                       shortcut, triggered, is_checked, shortcut_name, unique_name)
        self.actions_unique_map[ac.calibre_shortcut_unique_name] = ac.calibre_shortcut_unique_name
        self.menu_actions.append(ac)
-        #print("create_menu_item_ex after %s"%unique_name)
+        #print("create_menu_item_ex after %s"%menu_text)
        return ac

    def plugin_button(self):
@@ -480,9 +475,9 @@ make_firstimage_cover:true
        book['title'] = story.getMetadata("title", removeallentities=True)
        book['author_sort'] = book['author'] = story.getList("author", removeallentities=True)
        book['publisher'] = story.getMetadata("site")
-        book['tags'] = writer.getTags() # getTags could be moved up into adapter now.  Adapter didn't used to know the fileform
+        book['tags'] = writer.getTags(removeallentities=True) # getTags could be moved up into adapter now.  Adapter didn't used to know the fileform
        book['comments'] = stripHTML(story.getMetadata("description")) #, removeallentities=True) comments handles entities better.
-        book['series'] = story.getMetadata("series")
+        book['series'] = story.getMetadata("series", removeallentities=True)
        
        # adapter.opener is the element with a threadlock.  But del
        # adapter.opener doesn't work--subproc fails when it tries
@@ -904,18 +899,6 @@ make_firstimage_cover:true
                db.set_link_field_for_author(autid, unicode(authurls[i]),
                                             commit=False, notify=False)

-        # mi.title = oldmi.title
-        # mi.authors = oldmi.authors
-        # mi.publisher = oldmi.publisher
-        # mi.tags = oldmi.tags
-        # mi.languages = oldmi.languages
-        # mi.pubdate = oldmi.pubdate
-        # mi.timestamp = oldmi.timestamp
-        # mi.comments = oldmi.comments
-        # mi.series = oldmi.series
-                
-        # mi.set_identifiers(oldmi.get_identifiers())
-
        # implement 'newonly' flags here by setting to the current
        # value again.
        if not book['added']:
@@ -109,6 +109,9 @@ def do_download_for_worker(book,options):
    when run as a worker job
    '''
    try:
+        # import logging
+        # logging.basicConfig(level=logging.DEBUG,format="%(levelname)s:%(filename)s(%(lineno)d):%(message)s")
+        
        book['comment'] = 'Download started...'

        ffdlconfig = SafeConfigParser()
@@ -38,6 +38,7 @@ category_label:Category
 genre_label:Genre
 language_label:Language
 characters_label:Characters
+ships_label:Relationships
 series_label:Series
 ## Completed/In-Progress
 status_label:Status
@@ -70,7 +71,7 @@ version_label:FFDL Version
 ## You can include extra text or HTML that will be included as-is in
 ## the title page. Eg: titlepage_entries: ...,<br />,summary,<br />,...
 ## All current formats already include title and author.
-titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,description
+titlepage_entries: series,category,genre,language,characters,ships,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,description

 ## Try to collect series name and number of this story in series.
 ## Some sites (ab)use 'series' for reading lists and personal
@@ -121,11 +122,20 @@ allow_unsafe_filename: false

 ## entries to make epub subjects and calibre tags
 ## lastupdate creates two tags: "Last Update Year/Month: %Y/%m" and "Last Update: %Y/%m/%d"
-include_subject_tags: extratags, genre, category, characters, lastupdate, status
+include_subject_tags: extratags, genre, category, characters, ships, lastupdate, status

 ## extra tags (comma separated) to include, primarily for epub.
 extratags: FanFiction

+## extra categories, genres, characters, ships and warnings can be
+## configured.  Used primarily for sites that are dedicated to a genre
+## or 'ship and so don't included it for every story.
+#extracategories:
+#extragenres:
+#extracharacters:
+#extraships:
+#extrawarnings:
+
 ## number of seconds to sleep between calls to the story site.  May by
 ## useful if pulling large numbers of stories or if the site is slow.
 #slow_down_sleep_time:0.5
@@ -229,10 +239,12 @@ background_color: ffffff
 ## Allow customization of CSS.  Make sure to keep at least one space
 ## at the start of each line and to escape % to %%.  Also need
 ## background_color to be in the same section, if included in CSS.
+## 'adobe-text-layout: optimizeSpeed;' prevents hyphenation on newer Nooks
 output_css: 
 body { background-color: #%(background_color)s;
        text-align: justify;
-        margin: 2%%; }
+        margin: 2%%;
+	adobe-text-layout: optimizeSpeed; }
 pre { font-size: x-small; }
 sml { font-size: small; }
 h1 { text-align: center; }
@@ -316,6 +328,11 @@ nook_img_fix:true
 ## URLs like: http://test1.com?sid=12345
 [test1.com]
 extratags: FanFiction,Testing
+extracategories:Fafner
+extragenres:Romance,Fluff
+extracharacters:Reginald Smythe-Smythe,Mokona
+extraships:Smythe-Smythe/Mokona
+extrawarnings:Extreme Bogosity

 ## If necessary, you can define [<site>:<format>] sections to
 ## customize the formats differently for the same site.  Overrides
@@ -342,6 +359,11 @@ extratags: FanFiction,Testing,HTML
 #is_adult:true

 [ashwinder.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Hermione Granger
+extraships:Severus Snape/Hermione Granger
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -350,6 +372,9 @@ extratags: FanFiction,Testing,HTML
 #password:yourpassword

 [castlefans.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Castle
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -373,6 +398,11 @@ extratags: FanFiction,Testing,HTML
 cover_exclusion_regexp:/images/.*?ribbon.gif

 [dark-solace.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Buffy: The Vampire Slayer
+extracharacters:Buffy, Spike
+extraships:Spike/Buffy
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -381,6 +411,11 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #password:yourpassword

 [dramione.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Hermione Granger
+extraships:Draco Malfoy/Hermione Granger
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -394,6 +429,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [erosnsappho.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -404,6 +442,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 cover_exclusion_regexp:/images/.*?ribbon.gif

 [fanfiction.mugglenet.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -417,6 +458,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [fanfiction.portkey.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extraships:Harry Potter/Hermione Granger
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -439,6 +484,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #password:yourpassword

 [grangerenchanted.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Hermione Granger
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -452,26 +501,51 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [hlfiction.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Highlander
+
+[ksarchive.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Star Trek
+extracharacters:Kirk,Spock
+extraships:Kirk/Spock

 [lumos.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [national-library.net]
+## Site dedicated to these categories/characters/ships
+extracategories:West Wing

 [ncisfic.com]
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS

 [nfacommunity.com]
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [nha.magical-worlds.us]
+## Site dedicated to these categories/characters/ships
+extracategories:Buffy: The Vampire Slayer
+extracharacters:Willow

 [occlumency.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -480,6 +554,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #password:yourpassword

 [onedirectionfanfiction.com]
+## Site dedicated to these categories/characters/ships
+extracategories:One Direction
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -493,18 +570,28 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [ponyfictionarchive.net]
+## Site dedicated to these categories/characters/ships
+extracategories:My Little Pony: Friendship is Magic
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [pretendercentre.com]
+## Site dedicated to these categories/characters/ships
+extracategories:The Pretender
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [samdean.archive.nu]
+## Site dedicated to these categories/characters/ships
+extracategories:Supernatural
+extracharacters:Sam,Dean
+extraships:Sam/Dean

 [sg1-heliopolis.com]
 ## Some sites do not require a login, but do require the user to
@@ -513,6 +600,8 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [stargate-atlantis.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: Atlantis

 [svufiction.com]
 ## Some sites require login (or login for some rated stories) The
@@ -528,6 +617,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [thehexfiles.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Harry Potter
+extraships:Harry Potter/Draco Malfoy

 [themasque.net]
 ## Some sites require login (or login for some rated stories) The
@@ -543,6 +636,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [thequidditchpitch.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -556,12 +652,20 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [www.adastrafanfic.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Star Trek
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.dracoandginny.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Ginny Weasley
+extraships:Draco Malfoy/Ginny Weasley
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -575,8 +679,13 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [www.thealphagate.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: SG-1

 [www.checkmated.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -591,6 +700,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [www.dokuga.com]
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:Sesshoumaru,Kagome
+extraships:Sesshoumaru/Kagome

 [www.fanfiction.net]
 ## fanfiction.net's 'cover' images are really just tiny thumbnails.
@@ -608,6 +721,9 @@ never_make_cover: true
 [www.ficbook.net]

 [www.fictionalley.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -629,6 +745,9 @@ extratags:
 #password:yourpassword

 [www.fimfiction.net]
+## Site dedicated to these categories/characters/ships
+extracategories:My Little Pony: Friendship is Magic
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -640,20 +759,33 @@ extratags:
 #fail_on_password: false

 [www.harrypotterfanfiction.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.hpfandom.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.hpfanficarchive.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter

 [www.ik-eternal.net]
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:InuYasha,Kagome
+extraships:InuYasha/Kagome
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -667,6 +799,9 @@ extratags:
 #is_adult:true

 [www.libraryofmoria.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -675,6 +810,9 @@ extratags:
 [www.mediaminer.org]

 [www.midnightwhispers.ca]
+## Site dedicated to these categories/characters/ships
+extracategories:Queer as Folk
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -685,8 +823,14 @@ extratags:
 cover_exclusion_regexp:/stories/999/images/.*?_trophy.png

 [www.ncisfiction.com]
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS

 [www.phoenixsong.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extraships:Harry Potter/Ginny Weasley
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -695,22 +839,43 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png
 #password:yourpassword

 [www.potionsandsnitches.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter

 [www.prisonbreakfic.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Prison Break

 [www.scarvesandcoffee.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Glee
+extracharacters:Kurt Hummel,Blaine Anderson
+
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
+[www.sinful-desire.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Supernatural
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.siye.co.uk]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Harry Potter,Ginny Weasley
+extraships:Harry Potter/Ginny Weasley

 [www.squidge.org/peja]
 # www.squidge.org/peja calls it Fandom <shrug>
 category_label:Fandom
 # Remove numWords -- www.squidge.org/peja word counts are inaccurate
-titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
+titlepage_entries: series,category,genre,language,characters,ships,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description

 [www.squidge.org/peja:txt]
 ## Add URLs since there aren't links.
@@ -718,6 +883,8 @@ titlepage_entries: series,category,genre,language,characters,status,datePublishe
 titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description

 [www.storiesofarda.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings

 [www.thepetulantpoetess.com]
 ## Some sites require login (or login for some rated stories) The
@@ -757,8 +924,13 @@ collect_series: false
 #password:yourpassword

 [www.twilightarchives.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight

 [www.twilighted.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -770,6 +942,9 @@ collect_series: false
 collect_series: false

 [www.twiwrite.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -781,6 +956,11 @@ collect_series: false
 collect_series: false

 [www.walkingtheplank.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Harry Potter
+extraships:Severus Snape/Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -802,8 +982,14 @@ collect_series: false
 #is_adult:true

 [www.wolverineandrogue.com]
+## Site dedicated to these categories/characters/ships
+extracategories:X-Men Movie
+extracharacters:Wolverine,Rogue

 [www.wraithbait.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: Atlantis
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -96,6 +96,7 @@ import adapter_dracoandginnycom
 import adapter_scarvesandcoffeenet
 import adapter_thepetulantpoetesscom
 import adapter_wolverineandroguecom
+import adapter_sinfuldesireorg

 ## This bit of complexity allows adapters to be added by just adding
 ## importing.  It eliminates the long if/else clauses we used to need
@@ -116,7 +117,7 @@ for x in imports():
            
 def getAdapter(config,url,fileform=None):
    ## fix up leading protocol.
-    fixedurl = re.sub(r"(?i)^[htp]+[:/]+","http://",url.strip())
+    fixedurl = re.sub(r"(?i)^[htps]+[:/]+","http://",url.strip())
    if not fixedurl.startswith("http"):
        fixedurl = "http://%s"%url
    ## remove any trailing '#' locations.
@@ -37,7 +37,6 @@ class AdAstraFanficComSiteAdapter(BaseSiteAdapter):
                               # Most sites that claim to be
                               # iso-8859-1 (and some that claim to be
                               # utf8) are really windows-1252.
-        self.story.addToList("category","Star Trek")
        self.is_adult=False
        
        # get storyId from url--url validation guarantees query is only sid=1234
@@ -231,9 +231,9 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter):
                self.story.addToList('characters',char.string)
        a = metasoup.find('dd',{'class':"relationship tags"})
        if a != None:
-            chars = a.findAll('a',{'class':"tag"})
-            for char in chars:
-                self.story.addToList('characters',char.string)
+            ships = a.findAll('a',{'class':"tag"})
+            for ship in ships:
+                self.story.addToList('ships',ship.string)
 		

        stats = metasoup.find('dl',{'class':'stats'})
@@ -56,11 +56,6 @@ class AshwinderSycophantHexComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','asph')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y"
@@ -80,11 +80,6 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','cslf') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Castle") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%b %d, %Y" # XXX
@@ -56,11 +56,6 @@ class ChaosSycophantHexComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','csph')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        #self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y"
@@ -44,25 +44,20 @@ class CheckmatedComAdapter(BaseSiteAdapter):
        self.username = "" # if left empty, site doesn't return any message at all.
        self.password = ""
        self.is_adult=False
-        
+
        # get storyId from url--url validation guarantees query is only sid=1234
        self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1])
        logging.debug("storyId: (%s)"%self.story.getMetadata('storyId'))
-        
+
        self._setURL('http://' + self.getSiteDomain() + '/story.php?story='+self.story.getMetadata('storyId'))
-        
+
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','chm')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%b %d, %Y"
-            
+
    @staticmethod # must be @staticmethod, don't remove it.
    def getSiteDomain():
        # The site domain.  Does have www here, if it uses it.
@@ -82,7 +77,7 @@ class CheckmatedComAdapter(BaseSiteAdapter):
            return True
        else:
            return False
-        
+
    def performLogin(self, url):
        params = {}

@@ -93,8 +88,8 @@ class CheckmatedComAdapter(BaseSiteAdapter):
            params['name'] = self.getConfig("username")
            params['pass'] = self.getConfig("password")
        params['login'] = 'yes'
-        params['submit'] = 'login'	
-	
+        params['submit'] = 'login'
+
        loginUrl = 'http://' + self.getSiteDomain()+'/login.php'
        d = self._fetchUrl(loginUrl,params)
        e = self._fetchUrl(url)
@@ -135,33 +130,33 @@ class CheckmatedComAdapter(BaseSiteAdapter):
        # The actual text that is used to announce you need to be an
        # adult varies from site to site.  Again, print data before
        # the title search to troubleshoot.
-            
+
        if "Access denied. This story has not been validated by the adminstrators of this site." in data:
            raise exceptions.FailedToDownload(self.getSiteDomain() +" says: Access denied. This story has not been validated by the adminstrators of this site.")
-            
+
        # use BeautifulSoup HTML parser to make everything easier to find.
        soup = bs.BeautifulSoup(data)
        # print data

        # Now go hunting for all the meta data and the chapter list.
-        
+
        ## Title
        a = soup.findAll('span', {'class' : 'storytitle'})
        self.story.setMetadata('title',a[0].string)
-        
+
        # Find authorid and URL from... author url.
        a = a[1].find('a', href=re.compile(r"authors.php\?name\=\w+"))
        self.story.setMetadata('authorId',a['href'].split('=')[1])
        self.story.setMetadata('authorUrl','http://'+self.host+'/'+a['href'])
        self.story.setMetadata('author',a.string)
-			
+
        a = soup.find('select', {'name' : 'chapter'})
        if a == None:
            self.chapterUrls.append((self.story.getMetadata('title'),url))
        else:
            for chapter in a.findAll('option'):
                self.chapterUrls.append((stripHTML(chapter),'http://'+self.host+'/story.php?story='+self.story.getMetadata('storyId')+'&chapter='+chapter['value']))
-			
+
        self.story.setMetadata('numChapters',len(self.chapterUrls))

        # eFiction sites don't help us out a lot with their meta data
@@ -174,7 +169,7 @@ class CheckmatedComAdapter(BaseSiteAdapter):
            except:
                return ""

-				
+
        # website does not keep track of word count, and there is no convenient way to calculate it

        summary = soup.find('fieldset')
@@ -182,21 +177,23 @@ class CheckmatedComAdapter(BaseSiteAdapter):
        summary.name='div'
        self.setDescription(url,summary)

-		
+
        # <span class="label">Rated:</span> NC-17<br /> etc
        table = soup.findAll('div', {'class' : 'text'})[1]
        for labels in table.findAll('tr'):
            value = labels.findAll('td')[1]
            label = labels.findAll('td')[0]

-			
+
            if 'Rating' in stripHTML(label):
                self.story.setMetadata('rating', stripHTML(value))

            if 'Ship' in stripHTML(label):
+                if value.string != "none/none":
+                    self.story.addToList('ships',value.string)
                for char in value.string.split('/'):
                    if char != 'none':
-                        self.story.addToList('characters',char)		
+                        self.story.addToList('characters',char)

            if 'Status' in stripHTML(label):
                if value.find('img', {'src' : 'img/incomplete.gif'}) == None:
@@ -206,11 +203,11 @@ class CheckmatedComAdapter(BaseSiteAdapter):

            if 'Published' in stripHTML(label):
                self.story.setMetadata('datePublished', makeDate(stripHTML(value), self.dateformat))
-            
+
            if 'Updated' in stripHTML(label):
                self.story.setMetadata('dateUpdated', makeDate(stripHTML(value), self.dateformat))
-			
-        a = self._fetchUrl(self.story.getMetadata('authorUrl')+'&cat=stories')	
+
+        a = self._fetchUrl(self.story.getMetadata('authorUrl')+'&cat=stories')
        for story in bs.BeautifulSoup(a).findAll('table', {'class' : 'storyinfo'}):
            a = story.find('a', href=re.compile(r"review.php\?s\="+self.story.getMetadata('storyId')+'&act=view'))
            if a != None:
@@ -220,8 +217,8 @@ class CheckmatedComAdapter(BaseSiteAdapter):
                    if 'genre' in stripHTML(label):
                        for genre in value.findAll('img'):
                            self.story.addToList('genre',genre['title'])
-        
-            
+
+
    # grab the text for an individual chapter.
    def getChapterText(self, url):

@@ -229,11 +226,11 @@ class CheckmatedComAdapter(BaseSiteAdapter):

        soup = bs.BeautifulSoup(self._fetchUrl(url),
                                     selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
-        
+
        div = soup.find('div', {'id' : 'resizeableText'})
        div.find('div', {'class' : 'storyTools'}).extract()

        if None == div:
            raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
-    
+
        return self.utf8FromSoup(url,div)
@@ -56,11 +56,6 @@ class DarkSolaceOrgAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','dksl')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Buffy the Vampire Slayer")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d %B %Y"
@@ -56,11 +56,6 @@ class DokugaComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','dkg')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","InuYasha")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        if 'fanfiction' in self.story.getMetadata('section'):
@@ -55,13 +55,6 @@ class DracoAndGinnyComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','dcagn')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-        self.story.addToList("characters","Ginny Weasley")
-        self.story.addToList("characters","Draco Malfoy")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%b %d, %Y"
@@ -295,6 +288,9 @@ class DracoAndGinnyComAdapter(BaseSiteAdapter):
                                     selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
        
        div = soup.find('div', {'class' : 'listbox'})
+        
+        if None == div:
+            div = soup.find('div', {'id' : 'story'})

        if None == div:
            raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
@@ -55,11 +55,6 @@ class DramioneOrgAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','drmn')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d %B %Y"
@@ -56,11 +56,6 @@ class ErosnSapphoSycophantHexComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','essph')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d/%m/%y"
@@ -37,7 +37,6 @@ class FictionAlleyOrgSiteAdapter(BaseSiteAdapter):
                               # Most sites that claim to be
                               # iso-8859-1 (and some that claim to be
                               # utf8) are really windows-1252.
-        self.story.addToList("category","Harry Potter")
        self.is_adult=False
        
        # get storyId from url--url validation guarantees query correct
@@ -133,11 +133,8 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
            if storyMetadata["categories"][category]:
                self.story.addToList("genre", category) 

-        self.story.addToList("category", "My Little Pony")
-        
        self.story.setMetadata("numWords", str(storyMetadata["words"]))
        
-        
        # fimfic is the first site with an explicit cover image.
        if self.getConfig('include_images') and "image" in storyMetadata.keys():
            coverurl = storyMetadata["image"]
@@ -60,11 +60,6 @@ class GrangerEnchantedCom(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','gech')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d/%b/%Y"
@@ -37,7 +37,6 @@ class HarryPotterFanFictionComSiteAdapter(BaseSiteAdapter):
                               # Most sites that claim to be
                               # iso-8859-1 (and some that claim to be
                               # utf8) are really windows-1252.
-        self.story.addToList("category","Harry Potter")
        self.is_adult=False
        
        # get storyId from url--url validation guarantees query is only psid=1234
@@ -55,11 +55,6 @@ class HLFictionNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','hlf')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Highlander")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%y"
@@ -60,11 +60,6 @@ class HPFandomNetAdapterAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','hpfdm') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%Y.%m.%d" # XXX
@@ -55,11 +55,6 @@ class HPFanficArchiveComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','hpffa')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%B %d, %Y"
@@ -55,11 +55,6 @@ class IkEternalNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','ike')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","InuYasha")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%B %d, %Y"
@@ -60,11 +60,6 @@ class KSArchiveComAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','ksa') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Star Trek") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%b/%d/%Y" # XXX
@@ -167,7 +162,7 @@ class KSArchiveComAdapter(BaseSiteAdapter): # XXX
        a = soup.find('a', href=re.compile(r"viewuser.php\?uid=\d+"))
        self.story.setMetadata('authorId',a['href'].split('=')[1])
        self.story.setMetadata('authorUrl','http://'+self.host+'/'+a['href'])
-        self.story.setMetadata('author',a.string)
+        self.story.setMetadata('author',stripHTML(a))

        # Find the chapters:
        for chapter in soup.findAll('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+"&chapter=\d+$")):
@@ -190,7 +185,7 @@ class KSArchiveComAdapter(BaseSiteAdapter): # XXX
        labels = soup.findAll('span',{'class':'label'})
        for labelspan in labels:
            value = labelspan.nextSibling
-            label = labelspan.string
+            label = stripHTML(labelspan)

            if 'Summary' in label:
                ## Everything until the next span class='label'
@@ -215,50 +210,50 @@ class KSArchiveComAdapter(BaseSiteAdapter): # XXX

            if 'Categories' in label:
                cats = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=categories'))
-                catstext = [cat.string for cat in cats]
+                catstext = [stripHTML(cat) for cat in cats]
                for cat in catstext:
                    # ran across one story with an empty <a href="browse.php?type=categories&amp;catid=1"></a>
                    # tag in the desc once.
                    if cat and cat.strip() in ('Poetry','Essays'):
-                        self.story.addToList('category',cat.string)
+                        self.story.addToList('category',stripHTML(cat))

            if 'Characters' in label:
                self.story.addToList('characters','Kirk')
                self.story.addToList('characters','Spock')
                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
-                charstext = [char.string for char in chars]
+                charstext = [stripHTML(char) for char in chars]
                for char in charstext:
-                    self.story.addToList('characters',char.string)
+                    self.story.addToList('characters',stripHTML(char))

            ## Not all sites use Genre, but there's no harm to
            ## leaving it in.  Check to make sure the type_id number
            ## is correct, though--it's site specific.
            if 'Genre' in label:
                genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=1')) # XXX
-                genrestext = [genre.string for genre in genres]
+                genrestext = [stripHTML(genre) for genre in genres]
                self.genre = ', '.join(genrestext)
                for genre in genrestext:
-                    self.story.addToList('genre',genre.string)
+                    self.story.addToList('genre',stripHTML(genre))

            ## In addition to Genre (which is very site specific) KSA
            ## has 'Story Type', which is much more what most sites
            ## call genre.
            if 'Story Type' in label:
                genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=5')) # XXX
-                genrestext = [genre.string for genre in genres]
+                genrestext = [stripHTML(genre) for genre in genres]
                self.genre = ', '.join(genrestext)
                for genre in genrestext:
-                    self.story.addToList('genre',genre.string)
+                    self.story.addToList('genre',stripHTML(genre))

            ## Not all sites use Warnings, but there's no harm to
            ## leaving it in.  Check to make sure the type_id number
            ## is correct, though--it's site specific.
            if 'Warnings' in label:
                warnings = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=2')) # XXX
-                warningstext = [warning.string for warning in warnings]
+                warningstext = [stripHTML(warning) for warning in warnings]
                self.warning = ', '.join(warningstext)
                for warning in warningstext:
-                    self.story.addToList('warnings',warning.string)
+                    self.story.addToList('warnings',stripHTML(warning))

            if 'Completed' in label:
                if 'Yes' in value:
@@ -277,7 +272,7 @@ class KSArchiveComAdapter(BaseSiteAdapter): # XXX
        try:
            # Find Series name from series URL.
            a = soup.find('a', href=re.compile(r"viewseries.php\?seriesid=\d+"))
-            series_name = a.string
+            series_name = stripHTML(a)
            series_url = 'http://'+self.host+'/'+a['href']

            # use BeautifulSoup HTML parser to make everything easier to find.
@@ -56,11 +56,6 @@ class LibraryOfMoriaComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','lom')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Lord of the Rings")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%B %d, %Y"
@@ -56,11 +56,6 @@ class LumosSycophantHexComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','lsph')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y"
@@ -60,11 +60,6 @@ class MidnightwhispersCaAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','mw') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Queer as Folk") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%B %d, %Y" # XXX
@@ -59,11 +59,6 @@ class MuggleNetComAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','mgln') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%y" # XXX
@@ -55,11 +55,6 @@ class NationalLibraryNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','ntlb')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","West Wing")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m-%d-%y"
@@ -154,6 +149,10 @@ class NationalLibraryNetAdapter(BaseSiteAdapter):
                for char in value.string.split(', '):
                    self.story.addToList('characters',char)
                    
+            if 'Pairing' in label:
+                for char in value.string.split(', '):
+                    self.story.addToList('ships',char)
+                    
            if 'Warnings' in label:
                for warning in value.string.split(', '):
                    self.story.addToList('warnings',warning)
@@ -55,11 +55,6 @@ class NCISFicComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','ncisf')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","NCIS")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m-%d-%y"
@@ -154,6 +149,10 @@ class NCISFicComAdapter(BaseSiteAdapter):
                for char in value.string.split(', '):
                    self.story.addToList('characters',char)
                    
+            if 'Pairing' in label:
+                for char in value.string.split(', '):
+                    self.story.addToList('ships',char)
+                    
            if 'Warnings' in label:
                for warning in value.string.split(', '):
                    self.story.addToList('warnings',warning)
@@ -56,11 +56,6 @@ class NCISFictionComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','ncisfn')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","NCIS")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d/%m/%Y"
@@ -157,6 +152,11 @@ class NCISFictionComAdapter(BaseSiteAdapter):
                for char in chars:
                    self.story.addToList('characters',char.string)

+            if 'Pairing' in label:
+                ships = value.findAll('a')
+                for ship in ships:
+                    self.story.addToList('ships',ship.string)
+
            if 'Genre' in label:
                genres = value.findAll('a')
                for genre in genres:
@@ -60,11 +60,6 @@ class NfaCommunityComAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','nfa') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","NCIS") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y" # XXX
@@ -56,11 +56,6 @@ class NHAMagicalWorldsUsAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','nha')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Buffy the Vampire Slayer")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = " %m/%d/%y"
@@ -56,11 +56,6 @@ class OcclumencySycophantHexComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','osph')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y"
@@ -55,11 +55,6 @@ class OneDirectionFanfictionComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','odf')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","One Direction")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%y"
@@ -55,11 +55,6 @@ class PhoenixSongNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','phs')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%B %d %Y"
@@ -60,11 +60,6 @@ class PonyFictionArchiveNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','pffa')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","My Little Pony")
-            
    @staticmethod # must be @staticmethod, don't remove it.
    def getSiteDomain():
        # The site domain.  Does have www here, if it uses it.
@@ -62,11 +62,6 @@ class PortkeyOrgAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','prtky') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d/%m/%y" # XXX
@@ -37,7 +37,6 @@ class PotionsAndSnitchesNetSiteAdapter(BaseSiteAdapter):
                               # Most sites that claim to be
                               # iso-8859-1 (and some that claim to be
                               # utf8) are really windows-1252.
-        self.story.addToList("category","Harry Potter")
        
        # get storyId from url--url validation guarantees query is only sid=1234
        self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1])
@@ -142,7 +141,7 @@ class PotionsAndSnitchesNetSiteAdapter(BaseSiteAdapter):
                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
                charstext = [char.string for char in chars]
                for char in charstext:
-                    if char == "!Snape and Harry (required)":
+                    if "Snape and Harry (required)" in char:
                        self.story.addToList('characters',"Snape")
                        self.story.addToList('characters',"Harry")
                    else:
@@ -55,11 +55,6 @@ class PretenderCenterComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','ptdc')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","The Pretender")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d/%m/%y"
@@ -55,11 +55,6 @@ class PrisonBreakFicNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','pbf')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Prison Break")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%B %d, %Y"
@@ -157,6 +152,11 @@ class PrisonBreakFicNetAdapter(BaseSiteAdapter):
                for char in chars:
                    self.story.addToList('characters',char.string)

+            if 'Pairing' in label:
+                ships = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=3')) # XXX
+                for ship in ships:
+                    self.story.addToList('ships',ship.string.replace(" and ","/"))
+
            if 'Genre' in label:
                genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=1')) # XXX
                for genre in genres:
@@ -55,11 +55,6 @@ class SamDeanArchiveNuAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','sda')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Supernatural")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%y"
@@ -55,13 +55,6 @@ class ScarvesAndCoffeeNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','scacf')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Glee")
-        self.story.addToList("characters","Kurt Hummel")
-        self.story.addToList("characters","Blaine Anderson")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y"
@@ -58,7 +58,7 @@ class SG1HeliopolisComAdapter(BaseSiteAdapter):

        # If all stories from the site fall into the same category,
        # the site itself isn't likely to label them as such, so we
-        # do.
+        # do.  Can't use extracategories, could be Atlantis or SG-1
        if 'atlantis' in self.story.getMetadata('section'):
            self.story.addToList("category","Stargate: Atlantis")
        else:
@@ -0,0 +1,248 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 Fanficdownloader team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import time
+import logging
+import re
+import urllib2
+
+from .. import BeautifulSoup as bs
+from ..htmlcleanup import stripHTML
+from .. import exceptions as exceptions
+
+from base_adapter import BaseSiteAdapter,  makeDate
+
+def getClass():
+    return SinfulDesireOrgAdapter
+
+# Class name has to be unique.  Our convention is camel case the
+# sitename with Adapter at the end.  www is skipped.
+class SinfulDesireOrgAdapter(BaseSiteAdapter):
+
+    def __init__(self, config, url):
+        BaseSiteAdapter.__init__(self, config, url)
+
+        self.decode = ["Windows-1252",
+                       "utf8"] # 1252 is a superset of iso-8859-1.
+                               # Most sites that claim to be
+                               # iso-8859-1 (and some that claim to be
+                               # utf8) are really windows-1252.
+        self.username = "NoneGiven" # if left empty, site doesn't return any message at all.
+        self.password = ""
+        self.is_adult=False
+        
+        # get storyId from url--url validation guarantees query is only sid=1234
+        self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1])
+        logging.debug("storyId: (%s)"%self.story.getMetadata('storyId'))
+        
+        # normalized story URL.
+        self._setURL('http://' + self.getSiteDomain() + '/archive/viewstory.php?sid='+self.story.getMetadata('storyId'))
+        
+        # Each adapter needs to have a unique site abbreviation.
+        self.story.setMetadata('siteabbrev','snds')
+
+        # The date format will vary from site to site.
+        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+        self.dateformat = "%m/%d/%Y"
+            
+    @staticmethod # must be @staticmethod, don't remove it.
+    def getSiteDomain():
+        # The site domain.  Does have www here, if it uses it.
+        return 'www.sinful-desire.org'
+
+    def getSiteExampleURLs(self):
+        return "http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=1234"
+
+    def getSiteURLPattern(self):
+        return re.escape("http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=")+r"\d+$"
+
+    ## Getting the chapter list and the meta data, plus 'is adult' checking.
+    def extractChapterUrlsAndMetadata(self):
+
+        if self.is_adult or self.getConfig("is_adult"):
+            # Weirdly, different sites use different warning numbers.
+            # If the title search below fails, there's a good chance
+            # you need a different number.  print data at that point
+            # and see what the 'click here to continue' url says.
+            addurl = "&warning=5"
+        else:
+            addurl=""
+
+        # index=1 makes sure we see the story chapter index.  Some
+        # sites skip that for one-chapter stories.
+        url = self.url+'&index=1'+addurl
+        logging.debug("URL: "+url)
+
+        try:
+            data = self._fetchUrl(url)
+        except urllib2.HTTPError, e:
+            if e.code == 404:
+                raise exceptions.StoryDoesNotExist(self.url)
+            else:
+                raise e
+
+        m = re.search(r"'viewstory.php\?sid=\d+((?:&amp;ageconsent=ok)?&amp;warning=\d+)'",data)
+        if m != None:
+            if self.is_adult or self.getConfig("is_adult"):
+                # We tried the default and still got a warning, so
+                # let's pull the warning number from the 'continue'
+                # link and reload data.
+                addurl = m.group(1)
+                # correct stupid &amp; error in url.
+                addurl = addurl.replace("&amp;","&")
+                url = self.url+'&index=1'+addurl
+                logging.debug("URL 2nd try: "+url)
+
+                try:
+                    data = self._fetchUrl(url)
+                except urllib2.HTTPError, e:
+                    if e.code == 404:
+                        raise exceptions.StoryDoesNotExist(self.url)
+                    else:
+                        raise e    
+            else:
+                raise exceptions.AdultCheckRequired(self.url)
+            
+        if "Access denied. This story has not been validated by the adminstrators of this site." in data:
+            raise exceptions.FailedToDownload(self.getSiteDomain() +" says: Access denied. This story has not been validated by the adminstrators of this site.")
+            
+        # use BeautifulSoup HTML parser to make everything easier to find.
+        soup = bs.BeautifulSoup(data)
+        # print data
+
+        # Now go hunting for all the meta data and the chapter list.
+        
+        ## Title
+        a = soup.find('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+"$"))
+        self.story.setMetadata('title',a.string)
+        
+        # Find authorid and URL from... author url.
+        a = soup.find('a', href=re.compile(r"viewuser.php\?uid=\d+"))
+        self.story.setMetadata('authorId',a['href'].split('=')[1])
+        self.story.setMetadata('authorUrl','http://'+self.host+'/archive/'+a['href'])
+        self.story.setMetadata('author',a.string)
+
+        # Find the chapters:
+        for chapter in soup.findAll('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+"&chapter=\d+$")):
+            # just in case there's tags, like <i> in chapter titles.
+            self.chapterUrls.append((stripHTML(chapter),'http://'+self.host+'/archive/'+chapter['href']+addurl))
+
+        self.story.setMetadata('numChapters',len(self.chapterUrls))
+
+        # eFiction sites don't help us out a lot with their meta data
+        # formating, so it's a little ugly.
+
+        # utility method
+        def defaultGetattr(d,k):
+            try:
+                return d[k]
+            except:
+                return ""
+
+        # <span class="label">Rated:</span> NC-17<br /> etc
+        labels = soup.findAll('span',{'class':'label'})
+        for labelspan in labels:
+            value = labelspan.nextSibling
+            label = labelspan.string
+
+            if 'Summary' in label:
+                ## Everything until the next span class='label'
+                svalue = ""
+                while not defaultGetattr(value,'class') == 'label':
+                    svalue += str(value)
+                    value = value.nextSibling
+                self.setDescription(url,svalue)
+                #self.story.setMetadata('description',stripHTML(svalue))
+
+            if 'Rated' in label:
+                self.story.setMetadata('rating', value)
+
+            if 'Word count' in label:
+                self.story.setMetadata('numWords', value)
+
+            if 'Categories' in label:
+                cats = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=categories'))
+                for cat in cats:
+                    self.story.addToList('category',cat.string)
+
+            if 'Characters' in label:
+                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
+                for char in chars:
+                    self.story.addToList('characters',char.string)
+
+            if 'Genre' in label:
+                genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=1'))
+                for genre in genres:
+                    self.story.addToList('genre',genre.string)
+                genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=3'))
+                for genre in genres:
+                    self.story.addToList('genre',genre.string)
+
+            if 'Warnings' in label:
+                warnings = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=2'))
+                for warning in warnings:
+                    self.story.addToList('warnings',warning.string)
+
+            if 'Completed' in label:
+                if 'Yes' in value:
+                    self.story.setMetadata('status', 'Completed')
+                else:
+                    self.story.setMetadata('status', 'In-Progress')
+
+            if 'Published' in label:
+                self.story.setMetadata('datePublished', makeDate(stripHTML(value), self.dateformat))
+            
+            if 'Updated' in label:
+                self.story.setMetadata('dateUpdated', makeDate(stripHTML(value), self.dateformat))
+
+        try:
+            # Find Series name from series URL.
+            a = soup.find('a', href=re.compile(r"viewseries.php\?seriesid=\d+"))
+            series_name = a.string
+            series_url = 'http://'+self.host+'/archive/'+a['href']
+
+            # use BeautifulSoup HTML parser to make everything easier to find.
+            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
+            # can't use ^viewstory...$ in case of higher rated stories with javascript href.
+            storyas = seriessoup.findAll('a', href=re.compile(r'viewstory.php\?sid=\d+'))
+            i=1
+            for a in storyas:
+                # skip 'report this' and 'TOC' links
+                if 'contact.php' not in a['href'] and 'index' not in a['href']:
+                    if a['href'] == ('viewstory.php?sid='+self.story.getMetadata('storyId')):
+                        self.setSeries(series_name, i)
+                        break
+                    i+=1
+            
+        except:
+            # I find it hard to care if the series parsing fails
+            pass
+            
+    # grab the text for an individual chapter.
+    def getChapterText(self, url):
+
+        logging.debug('Getting chapter text from: %s' % url)
+
+        soup = bs.BeautifulStoneSoup(self._fetchUrl(url),
+                                     selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
+        
+        div = soup.find('div', {'id' : 'story'})
+
+        if None == div:
+            raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
+    
+        return self.utf8FromSoup(url,div)
@@ -56,11 +56,6 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','siye') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%Y.%m.%d" # XXX
@@ -55,11 +55,6 @@ class StargateAtlantisOrgAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','stat')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Stargate: Atlantis")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%B %d %Y"
@@ -55,11 +55,6 @@ class StoriesOfArdaComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','soa')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Lord of the Rings")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y"
@@ -55,11 +55,6 @@ class TheAlphaGateComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','tag')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Stargate: SG-1")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d %b %Y"
@@ -55,11 +55,6 @@ class TheHexFilesNetAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','thf')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%Y.%m.%d"
@@ -60,11 +60,6 @@ class TheQuidditchPitchOrgAdapter(BaseSiteAdapter): # XXX
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','tqdpch') # XXX

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter") # XXX
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y" # XXX
@@ -55,11 +55,6 @@ class TwilightArchivesComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','twa')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Twilight")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d %b %y"
@@ -37,7 +37,6 @@ class TwilightedNetSiteAdapter(BaseSiteAdapter):
                               # Most sites that claim to be
                               # iso-8859-1 (and some that claim to be
                               # utf8) are really windows-1252.
-        self.story.addToList("category","Twilight")
        self.username = "NoneGiven" # if left empty, site doesn't return any message at all.
        self.password = ""
        
@@ -37,7 +37,6 @@ class TwiwriteNetSiteAdapter(BaseSiteAdapter):
                               # Most sites that claim to be
                               # iso-8859-1 (and some that claim to be
                               # utf8) are really windows-1252.
-        self.story.addToList("category","Twilight")
        self.is_adult = False
        self.username = "NoneGiven" # if left empty, twiwrite.net doesn't return any message at all.
        self.password = ""
@@ -53,11 +53,6 @@ class WalkingThePlankOrgAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','wtp')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Harry Potter")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%b %d, %Y"
@@ -55,13 +55,6 @@ class WolverineAndRogueComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','wrfa')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","X-Men Movie")
-        self.story.addToList("characters","Wolverine")
-        self.story.addToList("characters","Rogue")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%m/%d/%Y"
@@ -56,11 +56,6 @@ class WraithBaitComAdapter(BaseSiteAdapter):
        # Each adapter needs to have a unique site abbreviation.
        self.story.setMetadata('siteabbrev','wb')

-        # If all stories from the site fall into the same category,
-        # the site itself isn't likely to label them as such, so we
-        # do.
-        self.story.addToList("category","Stargate")
-
        # The date format will vary from site to site.
        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
        self.dateformat = "%d  %b %Y"
@@ -225,7 +225,7 @@ class Story:
    def getMetadata(self, key, removeallentities=False, doreplacements=True):
        value = None
        if self.isList(key):
-            value = ', '.join(self.getList(key))
+            value = ', '.join(self.getList(key, removeallentities))
        elif self.metadata.has_key(key):
            value = self.metadata[key]
            if value:
@@ -310,10 +310,10 @@ class Story:

        return retlist

-    def getLists(self):
+    def getLists(self, removeallentities=False):
        lsts = {}
        for ln in self.listables.keys():
-            lsts[ln] = self.getList(ln)
+            lsts[ln] = self.getList(ln, removeallentities)
        return lsts

    def isList(self,listname):
@@ -50,6 +50,7 @@ class BaseStoryWriter(Configurable):
            'genre',
            'language',
            'characters',
+            'ships',
            'series',
            'status',
            'datePublished',
@@ -81,6 +82,7 @@ class BaseStoryWriter(Configurable):
            'status':'Status',
            'series':'Series',
            'characters':'Characters',
+            'ships':'Relationships',
            'datePublished':'Published',
            'dateUpdated':'Updated',
            'dateCreated':'Packaged',
@@ -104,12 +106,19 @@ class BaseStoryWriter(Configurable):
            }
        self.story.setMetadata('formatname',self.getFormatName())
        self.story.setMetadata('formatext',self.getFormatExt())
-        
-        for tag in self.getConfigList("extratags"):
-            self.story.addToList("extratags",tag)

-    def getMetadata(self,key):
-        return stripHTML(self.story.getMetadata(key))
+        ## Look for config parameter, split and add each to metadata field.
+        for (config,metadata) in [("extratags","extratags"),
+                                  ("extracategories","category"),
+                                  ("extragenres","genre"),
+                                  ("extracharacters","characters"),
+                                  ("extraships","ships"),
+                                  ("extrawarnings","warnings")]:
+            for val in self.getConfigList(config):
+                self.story.addToList(metadata,val)
+
+    def getMetadata(self,key, removeallentities=False):
+        return stripHTML(self.story.getMetadata(key, removeallentities))

    def getOutputFileName(self):
        if self.getConfig('zip_output'):
@@ -252,7 +261,7 @@ class BaseStoryWriter(Configurable):
        if close:
            outstream.close()

-    def getTags(self):
+    def getTags(self, removeallentities=False):
        # set to avoid duplicates subject tags.
        subjectset = set()
        
@@ -265,10 +274,10 @@ class BaseStoryWriter(Configurable):
            if entry in self.getConfigList("include_subject_tags") and \
                    entry not in self.story.getLists() and \
                    self.story.getMetadata(entry):
-                subjectset.add(self.getMetadata(entry))
+                subjectset.add(self.getMetadata(entry, removeallentities))
                
        # listables all go into dc:subject tags, but only if they are configured.
-        for (name,lst) in self.story.getLists().iteritems():
+        for (name,lst) in self.story.getLists(removeallentities).iteritems():
            if name in self.getConfigList("include_subject_tags"):
                for tag in lst:
                    subjectset.add(tag)
@@ -54,14 +54,10 @@
 	      much easier. </p>
 	  </div>
 	  <!-- put announcements here, h3 is a good title size. -->
-	  <h3>New Sites</h3>
+	  <h3>New Feature</h3>
 	  <p>
-	    Now supporing www.dracoandginny.com,
-	    www.scarvesandcoffee.net, www.thepetulantpoetess.com and
-	    www.wolverineandrogue.com.  Thanks, Ida!
-	  </p>
-	  <p>
-	    FFDL now supports over 70 different fanfiction sites.
+	    FFDL now records 'Relationships' as metadata for those sites that provide it.
+	    
 	  </p>
 	  <p>
 	    Questions?  Check out our 
@@ -71,7 +67,7 @@
 	    If you have any problems with this application, please
 	    report them in
 	    the <a href="http://groups.google.com/group/fanfic-downloader">FanFictionDownLoader Google Group</a>.  The
-	    <a href="http://4-4-22.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
+	    <a href="http://4-4-23.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>
 	    {{ error_message }}
@@ -528,6 +524,11 @@
 	    Use the URL of the story's chapter list, such as
 	    <br /><a href="http://www.wolverineandrogue.com/wrfa/viewstory.php?sid=1234">http://www.wolverineandrogue.com/wrfa/viewstory.php?sid=1234</a>
 	  </dd>
+	  <dt>www.sinful-desire.org</dt>
+	  <dd>
+	    Use the URL of the story's chapter list, such as
+	    <br /><a href="http://www.sinful-desire.org/archive/viewstory.php?sid=1234">http://www.sinful-desire.org/archive/viewstory.php?sid=1234</a>
+	  </dd>
 	</dl>
 	<p>
 	  A few additional things to know, which will make your life substantially easier:
@@ -19,7 +19,7 @@
 ## overridden at several levels

 ## Some sites also require the user to confirm they are adult for
-## adult content.
+## adult content.  Uncomment by removing '#' in front of is_adult.
 #is_adult:true

 ## All available titlepage_entries and the label used for them:
@@ -42,6 +42,7 @@ category_label:Category
 genre_label:Genre
 language_label:Language
 characters_label:Characters
+ships_label:Relationships
 series_label:Series
 ## Completed/In-Progress
 status_label:Status
@@ -74,7 +75,7 @@ version_label:FFDL Version
 ## You can include extra text or HTML that will be included as-is in
 ## the title page. Eg: titlepage_entries: ...,<br />,summary,<br />,...
 ## All current formats already include title and author.
-titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,description
+titlepage_entries: series,category,genre,language,characters,ships,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,description

 ## Try to collect series name and number of this story in series.
 ## Some sites (ab)use 'series' for reading lists and personal
@@ -100,11 +101,20 @@ include_tocpage: true

 ## entries to make epub subjects and calibre tags
 ## lastupdate creates two tags: "Last Update Year/Month: %Y/%m" and "Last Update: %Y/%m/%d"
-include_subject_tags: extratags, genre, category, characters, status
+include_subject_tags: extratags, genre, category, characters, ships, status

 ## extra tags (comma separated) to include, primarily for epub.
 extratags: FanFiction

+## extra categories, genres, characters, ships and warnings can be
+## configured.  Used primarily for sites that are dedicated to a genre
+## or 'ship and so don't included it for every story.
+#extracategories:
+#extragenres:
+#extracharacters:
+#extraships:
+#extrawarnings:
+
 ## number of seconds to sleep between calls to the story site.  May by
 ## useful if pulling large numbers of stories or if the site is slow.
 #slow_down_sleep_time:0.5
@@ -214,10 +224,12 @@ background_color: ffffff
 ## Allow customization of CSS.  Make sure to keep at least one space
 ## at the start of each line and to escape % to %%.  Also need
 ## background_color to be in the same section, if included in CSS.
+## 'adobe-text-layout: optimizeSpeed;' prevents hyphenation on newer Nooks
 output_css: 
 body { background-color: #%(background_color)s;
        text-align: justify;
-        margin: 2%%; }
+        margin: 2%%;
+	adobe-text-layout: optimizeSpeed; }
 pre { font-size: x-small; }
 sml { font-size: small; }
 h1 { text-align: center; }
@@ -301,6 +313,11 @@ nook_img_fix:true
 ## URLs like: http://test1.com?sid=12345
 [test1.com]
 extratags: FanFiction,Testing
+extracategories:Fafner
+extragenres:Romance,Fluff
+extracharacters:Reginald Smythe-Smythe,Mokona
+extraships:Smythe-Smythe/Mokona
+extrawarnings:Extreme Bogosity

 ## If necessary, you can define [<site>:<format>] sections to
 ## customize the formats differently for the same site.  Overrides
@@ -327,6 +344,11 @@ extratags: FanFiction,Testing,HTML
 #is_adult:true

 [ashwinder.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Hermione Granger
+extraships:Severus Snape/Hermione Granger
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -335,6 +357,9 @@ extratags: FanFiction,Testing,HTML
 #password:yourpassword

 [castlefans.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Castle
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -358,6 +383,11 @@ extratags: FanFiction,Testing,HTML
 cover_exclusion_regexp:/images/.*?ribbon.gif

 [dark-solace.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Buffy: The Vampire Slayer
+extracharacters:Buffy, Spike
+extraships:Spike/Buffy
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -366,6 +396,11 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #password:yourpassword

 [dramione.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Hermione Granger
+extraships:Draco Malfoy/Hermione Granger
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -379,6 +414,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [erosnsappho.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -389,6 +427,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 cover_exclusion_regexp:/images/.*?ribbon.gif

 [fanfiction.mugglenet.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -402,6 +443,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [fanfiction.portkey.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extraships:Harry Potter/Hermione Granger
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -424,6 +469,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #password:yourpassword

 [grangerenchanted.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Hermione Granger
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -437,26 +486,51 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [hlfiction.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Highlander
+
+[ksarchive.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Star Trek
+extracharacters:Kirk,Spock
+extraships:Kirk/Spock

 [lumos.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [national-library.net]
+## Site dedicated to these categories/characters/ships
+extracategories:West Wing

 [ncisfic.com]
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS

 [nfacommunity.com]
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [nha.magical-worlds.us]
+## Site dedicated to these categories/characters/ships
+extracategories:Buffy: The Vampire Slayer
+extracharacters:Willow

 [occlumency.sycophanthex.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -465,6 +539,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #password:yourpassword

 [onedirectionfanfiction.com]
+## Site dedicated to these categories/characters/ships
+extracategories:One Direction
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -478,18 +555,28 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [ponyfictionarchive.net]
+## Site dedicated to these categories/characters/ships
+extracategories:My Little Pony: Friendship is Magic
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [pretendercentre.com]
+## Site dedicated to these categories/characters/ships
+extracategories:The Pretender
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [samdean.archive.nu]
+## Site dedicated to these categories/characters/ships
+extracategories:Supernatural
+extracharacters:Sam,Dean
+extraships:Sam/Dean

 [sg1-heliopolis.com]
 ## Some sites do not require a login, but do require the user to
@@ -498,6 +585,8 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [stargate-atlantis.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: Atlantis

 [svufiction.com]
 ## Some sites require login (or login for some rated stories) The
@@ -513,6 +602,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [thehexfiles.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Harry Potter
+extraships:Harry Potter/Draco Malfoy

 [themasque.net]
 ## Some sites require login (or login for some rated stories) The
@@ -528,6 +621,9 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [thequidditchpitch.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -541,12 +637,20 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [www.adastrafanfic.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Star Trek
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.dracoandginny.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Draco Malfoy,Ginny Weasley
+extraships:Draco Malfoy/Ginny Weasley
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -560,8 +664,13 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [www.thealphagate.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: SG-1

 [www.checkmated.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -576,6 +685,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 #is_adult:true

 [www.dokuga.com]
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:Sesshoumaru,Kagome
+extraships:Sesshoumaru/Kagome

 [www.fanfiction.net]
 ## fanfiction.net's 'cover' images are really just tiny thumbnails.
@@ -593,6 +706,9 @@ never_make_cover: true
 [www.ficbook.net]

 [www.fictionalley.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -611,6 +727,9 @@ extratags:
 #password:yourpassword

 [www.fimfiction.net]
+## Site dedicated to these categories/characters/ships
+extracategories:My Little Pony: Friendship is Magic
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -622,20 +741,33 @@ extratags:
 #fail_on_password: false

 [www.harrypotterfanfiction.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.hpfandom.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.hpfanficarchive.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter

 [www.ik-eternal.net]
+## Site dedicated to these categories/characters/ships
+extracategories:InuYasha
+extracharacters:InuYasha,Kagome
+extraships:InuYasha/Kagome
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -649,6 +781,9 @@ extratags:
 #is_adult:true

 [www.libraryofmoria.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -657,6 +792,9 @@ extratags:
 [www.mediaminer.org]

 [www.midnightwhispers.ca]
+## Site dedicated to these categories/characters/ships
+extracategories:Queer as Folk
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -667,8 +805,14 @@ extratags:
 cover_exclusion_regexp:/stories/999/images/.*?_trophy.png

 [www.ncisfiction.com]
+## Site dedicated to these categories/characters/ships
+extracategories:NCIS

 [www.phoenixsong.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extraships:Harry Potter/Ginny Weasley
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -677,22 +821,43 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png
 #password:yourpassword

 [www.potionsandsnitches.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter

 [www.prisonbreakfic.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Prison Break

 [www.scarvesandcoffee.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Glee
+extracharacters:Kurt Hummel,Blaine Anderson
+
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content.  In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
+[www.sinful-desire.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Supernatural
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true

 [www.siye.co.uk]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Harry Potter,Ginny Weasley
+extraships:Harry Potter/Ginny Weasley

 [www.squidge.org/peja]
 # www.squidge.org/peja calls it Fandom <shrug>
 category_label:Fandom
 # Remove numWords -- www.squidge.org/peja word counts are inaccurate
-titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
+titlepage_entries: series,category,genre,language,characters,ships,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description

 [www.squidge.org/peja:txt]
 ## Add URLs since there aren't links.
@@ -700,6 +865,8 @@ titlepage_entries: series,category,genre,language,characters,status,datePublishe
 titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description

 [www.storiesofarda.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Lord of the Rings

 [www.thepetulantpoetess.com]
 ## Some sites require login (or login for some rated stories) The
@@ -739,8 +906,13 @@ collect_series: false
 #password:yourpassword

 [www.twilightarchives.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight

 [www.twilighted.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -752,6 +924,9 @@ collect_series: false
 collect_series: false

 [www.twiwrite.net]
+## Site dedicated to these categories/characters/ships
+extracategories:Twilight
+
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
 ## commandline version, this should go in your personal.ini, not
@@ -763,6 +938,11 @@ collect_series: false
 collect_series: false

 [www.walkingtheplank.org]
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+extracharacters:Severus Snape,Harry Potter
+extraships:Severus Snape/Harry Potter
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -784,8 +964,14 @@ collect_series: false
 #is_adult:true

 [www.wolverineandrogue.com]
+## Site dedicated to these categories/characters/ships
+extracategories:X-Men Movie
+extracharacters:Wolverine,Rogue

 [www.wraithbait.com]
+## Site dedicated to these categories/characters/ships
+extracategories:Stargate: Atlantis
+
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
@@ -1,9 +1,9 @@
 ## This is an example of what your personal configuration might look
-## like.
+## like.  Uncomment options by removing the '#' in front of them.

 [defaults]
 ## Some sites also require the user to confirm they are adult for
-## adult content.
+## adult content.  Uncomment by removing '#' in front of is_adult.
 #is_adult:true

 ## include images from img tags in the body and summary of
@@ -28,18 +28,9 @@
 ## space.
 #grayscale_images: false

-## Try to collect series name and number of this story in series.
-## Some sites (ab)use 'series' for reading lists and personal
-## collections.  This lets us turn it on and off by site without
-## keeping a lengthy titlepage_entries per site and prevents it
-## updating in the plugin.
-## Turn off in [defaults] or [overrides] to prevent all sites from
-## updating series column.
-## default is true
-#collect_series: false
-
 ## Most common, I expect will be using this to save username/passwords
-## for different sites.
+## for different sites.  Here are a few examples.
+
 [www.twilighted.net]
 #username:YourPenname
 #password:YourPassword
Author	SHA1	Message	Date
Jim Miller	079a0f5906	Scroll custom columns config, bump versions.	2012-09-06 17:23:25 -05:00
Jim Miller	f31fcc3341	Add extracategories, etc, Relationships, another Mac fix, fix for & in tags.	2012-09-05 12:20:35 -05:00
Ida	7eb1685be1	Allows different skins for stories that require login	2012-08-28 19:46:50 -04:00
Jim Miller	30997053ef	Added tag calibre-plugin-1.6.07 for changeset 9bad71f4988c	2012-08-27 12:14:01 -05:00
Jim Miller	347eb69044	Shortcuts for config/about for Mac. Handle tags inside metadata on ksarchivecom. Some Mac versions crash if there are menu items set to not have shortcuts. Also accept https, but change to http.	2012-08-27 12:13:31 -05:00
Jim Miller	86329a1fe3	Added tag FanFictionDownLoader-4.4.23a for changeset d9c3c28e545c	2012-08-25 21:50:32 -05:00
Jim Miller	3bcc31a404	Added tag calibre-plugin-1.6.06 for changeset d9c3c28e545c	2012-08-25 21:50:12 -05:00
Jim Miller	5e7c28d2dc	Integrate new site, add adobe-text-layout to epub CSS for no nook hyphenation.	2012-08-25 21:49:36 -05:00
Ida	574981931f	New adapter for www.sinful-desire.org	2012-08-24 13:29:30 -04:00
Jim Miller	a54765cf86	Added tag FanFictionDownLoader-4.4.23 for changeset 4437edd5f6fc	2012-08-23 11:57:46 -05:00
Jim Miller	7cd77c64d1	Added tag calibre-plugin-1.6.05 for changeset 4437edd5f6fc	2012-08-23 11:57:17 -05:00