Couple more small fixes to plugin.

tidy defaults.ini a little, pull u/p/is_adult up to base_adapter.py for plugin.

app.yaml

@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanfictiondownloader
-application: fanfictiondownloader
-version: 4-3-2
+application: ffd-retief-hrd
+version: 4-2-0
 runtime: python27
 api_version: 1
 threadsafe: true

calibre-plugin/__init__.py

@@ -11,9 +11,7 @@ __docformat__ = 'restructuredtext en'
 # The class that all Interface Action plugin wrappers must inherit from
 from calibre.customize import InterfaceActionBase
 
-## Apparently the name for this class doesn't matter--it was still
-## 'demo' for the first few versions.
-class FanFictionDownLoaderBase(InterfaceActionBase):
+class InterfacePluginDemo(InterfaceActionBase):
     '''
     This class is a simple wrapper that provides information about the
     actual plugin class. The actual interface plugin class is called
@@ -27,7 +25,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
     description         = 'UI plugin to download FanFiction stories from various sites.'
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (1, 4, 6)
+    version             = (1, 1, 0)
     minimum_calibre_version = (0, 8, 30)
 
     #: This field defines the GUI plugin class that contains all the code
@@ -65,7 +63,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
         # GUI libraries to be loaded, which we do not want when using calibre
         # from the command line
         from calibre_plugins.fanfictiondownloader_plugin.config import ConfigWidget
-        return ConfigWidget(self.actual_plugin_)
+        return ConfigWidget()
 
     def save_settings(self, config_widget):
         '''

calibre-plugin/about.txt

@@ -1,3 +1,4 @@
+<p>FanFictionDownLoader Plugin</p>
 <hr />
 
 <p>Created by Jim Miller, borrowing heavily from Grant Drake's
@@ -11,10 +12,10 @@ Calibre officially distributes plugins from the mobileread.com forum site.
 The official distro channel for this plugin is there: <a href="http://www.mobileread.com/forums/showthread.php?t=163261">FanFictionDownLoader</a>
 </p>
 
-<p> I also monitor the
+<p> However, I monitor the
 <a href="http://groups.google.com/group/fanfic-downloader">general users
-group</a> for the downloader.  That covers the web application and CLI, too.
+group</a> for the downloader more closely.  That also covers the web application and CLI.
 </p>
 
-The source for this plugin is available
-<a href="http://code.google.com/p/fanficdownloader/source/checkout">here</a>.
+The source project for this plugin is <a href="http://code.google.com/p/fanficdownloader/source/checkout">
+also available</a>.

calibre-plugin/config.py

@@ -7,198 +7,40 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Jim Miller'
 __docformat__ = 'restructuredtext en'
 
-import traceback, copy
-
-from PyQt4.Qt import (QDialog, QWidget, QVBoxLayout, QHBoxLayout, QLabel, QLineEdit, QFont,
-                      QTextEdit, QComboBox, QCheckBox, QPushButton, QTabWidget, QVariant)
+from PyQt4.Qt import (QDialog, QWidget, QVBoxLayout, QHBoxLayout, QLabel, QLineEdit,
+                      QTextEdit, QComboBox, QCheckBox, QPushButton)
 
 from calibre.gui2 import dynamic, info_dialog
 from calibre.utils.config import JSONConfig
-from calibre.gui2.ui import get_gui
 
 from calibre_plugins.fanfictiondownloader_plugin.dialogs \
     import (SKIP, ADDNEW, UPDATE, UPDATEALWAYS, OVERWRITE, OVERWRITEALWAYS,
              CALIBREONLY,collision_order)
 
-from calibre_plugins.fanfictiondownloader_plugin.common_utils \
-    import ( get_library_uuid, KeyboardConfigDialog )
-
-from calibre.gui2.complete import MultiCompleteLineEdit
-
 # This is where all preferences for this plugin will be stored
 # Remember that this name (i.e. plugins/fanfictiondownloader_plugin) is also
 # in a global namespace, so make it as unique as possible.
 # You should always prefix your config file name with plugins/,
 # so as to ensure you dont accidentally clobber a calibre config file
-all_prefs = JSONConfig('plugins/fanfictiondownloader_plugin')
+prefs = JSONConfig('plugins/fanfictiondownloader_plugin')
 
-# Set defaults used by all.  Library specific settings continue to
-# take from here.
-all_prefs.defaults['personal.ini'] = get_resources('plugin-example.ini')
-all_prefs.defaults['updatemeta'] = True
-all_prefs.defaults['keeptags'] = False
-all_prefs.defaults['urlsfromclip'] = True
-all_prefs.defaults['updatedefault'] = True
-all_prefs.defaults['fileform'] = 'epub'
-all_prefs.defaults['collision'] = OVERWRITE
-all_prefs.defaults['deleteotherforms'] = False
-all_prefs.defaults['send_lists'] = ''
-all_prefs.defaults['read_lists'] = ''
-all_prefs.defaults['addtolists'] = False
-all_prefs.defaults['addtoreadlists'] = False
-all_prefs.defaults['addtolistsonread'] = False
-all_prefs.defaults['custom_cols'] = {}
+# Set defaults
+prefs.defaults['personal.ini'] = get_resources('example.ini')
+prefs.defaults['updatemeta'] = True
+#prefs.defaults['onlyoverwriteifnewer'] = False
+prefs.defaults['urlsfromclip'] = True
+prefs.defaults['updatedefault'] = True
+prefs.defaults['fileform'] = 'epub'
+prefs.defaults['collision'] = OVERWRITE
+prefs.defaults['deleteotherforms'] = False
 
-# The list of settings to copy from all_prefs or the previous library
-# when config is called for the first time on a library.
-copylist = ['personal.ini',
-            'updatemeta',
-            'keeptags',
-            'urlsfromclip',
-            'updatedefault',
-            'fileform',
-            'collision',
-            'deleteotherforms']
-
-# fake out so I don't have to change the prefs calls anywhere.  The
-# Java programmer in me is offended by op-overloading, but it's very
-# tidy.
-class PrefsFacade():
-    def __init__(self,all_prefs):
-        self.all_prefs = all_prefs
-        self.lastlibid = None
-
-    def _get_copylist_prefs(self,frompref):
-        return filter( lambda x : x[0] in copylist, frompref.items() )
-        
-    def _get_prefs(self):
-        libraryid = get_library_uuid(get_gui().current_db)
-        if libraryid not in self.all_prefs:
-            if self.lastlibid == None:
-                self.all_prefs[libraryid] = dict(self._get_copylist_prefs(self.all_prefs))
-            else:
-                self.all_prefs[libraryid] = dict(self._get_copylist_prefs(self.all_prefs[self.lastlibid]))
-            self.lastlibid = libraryid
-            
-        return self.all_prefs[libraryid]
-
-    def _save_prefs(self,prefs):
-        libraryid = get_library_uuid(get_gui().current_db)
-        self.all_prefs[libraryid] = prefs
-        
-    def __getitem__(self,k):            
-        prefs = self._get_prefs()
-        if k not in prefs:
-            # pulls from all_prefs.defaults automatically if not set
-            # in all_prefs
-            return self.all_prefs[k]
-        return prefs[k]
-
-    def __setitem__(self,k,v):
-        prefs = self._get_prefs()
-        prefs[k]=v
-        self._save_prefs(prefs)
-
-    # to be avoided--can cause unexpected results as possibly ancient
-    # all_pref settings may be pulled.
-    def __delitem__(self,k):
-        prefs = self._get_prefs()
-        del prefs[k]
-        self._save_prefs(prefs)
-
-prefs = PrefsFacade(all_prefs)
-    
 class ConfigWidget(QWidget):
 
-    def __init__(self, plugin_action):
+    def __init__(self):
         QWidget.__init__(self)
-        self.plugin_action = plugin_action
-        
         self.l = QVBoxLayout()
         self.setLayout(self.l)
 
-        tab_widget = QTabWidget(self)
-        self.l.addWidget(tab_widget)
-
-        self.basic_tab = BasicTab(self, plugin_action)
-        tab_widget.addTab(self.basic_tab, 'Basic')
-
-        self.personalini_tab = PersonalIniTab(self, plugin_action)
-        tab_widget.addTab(self.personalini_tab, 'personal.ini')
-        
-        self.list_tab = ListTab(self, plugin_action)
-        tab_widget.addTab(self.list_tab, 'Reading Lists')
-        if 'Reading List' not in plugin_action.gui.iactions:
-            self.list_tab.setEnabled(False)
-
-        self.columns_tab = ColumnsTab(self, plugin_action)
-        tab_widget.addTab(self.columns_tab, 'Custom Columns')
-
-        self.other_tab = OtherTab(self, plugin_action)
-        tab_widget.addTab(self.other_tab, 'Other')
-
-
-    def save_settings(self):
-
-        # basic
-        prefs['fileform'] = unicode(self.basic_tab.fileform.currentText())
-        prefs['collision'] = unicode(self.basic_tab.collision.currentText())
-        prefs['updatemeta'] = self.basic_tab.updatemeta.isChecked()
-        prefs['keeptags'] = self.basic_tab.keeptags.isChecked()
-        prefs['urlsfromclip'] = self.basic_tab.urlsfromclip.isChecked()
-        prefs['updatedefault'] = self.basic_tab.updatedefault.isChecked()
-        prefs['deleteotherforms'] = self.basic_tab.deleteotherforms.isChecked()
-
-        if self.list_tab:
-            # lists
-            prefs['send_lists'] = ', '.join(map( lambda x : x.strip(), filter( lambda x : x.strip() != '', unicode(self.list_tab.send_lists_box.text()).split(','))))
-            prefs['read_lists'] = ', '.join(map( lambda x : x.strip(), filter( lambda x : x.strip() != '', unicode(self.list_tab.read_lists_box.text()).split(','))))
-            # print("send_lists: %s"%prefs['send_lists'])
-            # print("read_lists: %s"%prefs['read_lists'])
-            prefs['addtolists'] = self.list_tab.addtolists.isChecked()
-            prefs['addtoreadlists'] = self.list_tab.addtoreadlists.isChecked()
-            prefs['addtolistsonread'] = self.list_tab.addtolistsonread.isChecked()
-
-        # personal.ini
-        ini = unicode(self.personalini_tab.ini.toPlainText())
-        if ini:
-            prefs['personal.ini'] = ini
-        else:
-            # if they've removed everything, reset to default.
-            prefs['personal.ini'] = get_resources('plugin-example.ini')
-
-        # Custom Columns tab
-        colsmap = {}
-        for (col,combo) in self.columns_tab.custcol_dropdowns.iteritems():
-            val = unicode(combo.itemData(combo.currentIndex()).toString())
-            if val != 'none':
-                colsmap[col] = val
-                #print("colsmap[%s]:%s"%(col,colsmap[col]))
-        prefs['custom_cols'] = colsmap
-        
-    def edit_shortcuts(self):
-        self.save_settings()
-        # Force the menus to be rebuilt immediately, so we have all our actions registered
-        self.plugin_action.rebuild_menus()
-        d = KeyboardConfigDialog(self.plugin_action.gui, self.plugin_action.action_spec[0])
-        if d.exec_() == d.Accepted:
-            self.plugin_action.gui.keyboard.finalize()
-
-class BasicTab(QWidget):
-
-    def __init__(self, parent_dialog, plugin_action):
-        self.parent_dialog = parent_dialog
-        self.plugin_action = plugin_action
-        QWidget.__init__(self)
-        
-        self.l = QVBoxLayout()
-        self.setLayout(self.l)
-
-        label = QLabel('These settings control the basic features of the plugin--downloading FanFiction.')
-        label.setWordWrap(True)
-        self.l.addWidget(label)
-        self.l.addSpacing(5)
-        
         horz = QHBoxLayout()
         label = QLabel('Default Output &Format:')
         horz.addWidget(label)
@@ -209,7 +51,6 @@ class BasicTab(QWidget):
         self.fileform.addItem('txt')
         self.fileform.setCurrentIndex(self.fileform.findText(prefs['fileform']))
         self.fileform.setToolTip('Choose output format to create.  May set default from plugin configuration.')
-        self.fileform.activated.connect(self.set_collisions)
         label.setBuddy(self.fileform)
         horz.addWidget(self.fileform)
         self.l.addLayout(horz)
@@ -219,28 +60,26 @@ class BasicTab(QWidget):
         label.setToolTip("What to do if there's already an existing story with the same title and author.")
         horz.addWidget(label)
         self.collision = QComboBox(self)
-        # add collision options
-        self.set_collisions()
-        i = self.collision.findText(prefs['collision'])
-        if i > -1:
-            self.collision.setCurrentIndex(i)
+        for o in collision_order:
+            self.collision.addItem(o)
+        self.collision.setCurrentIndex(self.collision.findText(prefs['collision']))
         # self.collision.setToolTip('Overwrite will replace the existing story.  Add New will create a new story with the same title and author.')
         label.setBuddy(self.collision)
         horz.addWidget(self.collision)
         self.l.addLayout(horz)
 
         self.updatemeta = QCheckBox('Default Update Calibre &Metadata?',self)
-        self.updatemeta.setToolTip('Update title, author, URL, tags, custom columns, etc for story in Calibre from web site.')
+        self.updatemeta.setToolTip('Update metadata for story in Calibre from web site?')
         self.updatemeta.setChecked(prefs['updatemeta'])
         self.l.addWidget(self.updatemeta)
 
-        self.keeptags = QCheckBox('Keep Existing Tags when Updating Metadata?',self)
-        self.keeptags.setToolTip('Existing tags will be kept and any new tags added.\nCompleted and In-Progress tags will be still be updated, if known.\nLast Updated tags will be updated if lastupdate in include_subject_tags.')
-        self.keeptags.setChecked(prefs['keeptags'])
-        self.l.addWidget(self.keeptags)
-
+        # self.onlyoverwriteifnewer = QCheckBox('Default Only Overwrite Story if Newer',self)
+        # self.onlyoverwriteifnewer.setToolTip("Don't overwrite existing book unless the story on the web site is newer or from the same day.")
+        # self.onlyoverwriteifnewer.setChecked(prefs['onlyoverwriteifnewer'])
+        # self.l.addWidget(self.onlyoverwriteifnewer)
+        
         self.urlsfromclip = QCheckBox('Take URLs from Clipboard?',self)
-        self.urlsfromclip.setToolTip('Prefill URLs from valid URLs in Clipboard when Adding New.')
+        self.urlsfromclip.setToolTip('Prefill URLs from valid URLs in Clipboard when Adding New?')
         self.urlsfromclip.setChecked(prefs['urlsfromclip'])
         self.l.addWidget(self.urlsfromclip)
 
@@ -255,46 +94,10 @@ class BasicTab(QWidget):
         self.deleteotherforms.setChecked(prefs['deleteotherforms'])
         self.l.addWidget(self.deleteotherforms)
         
-        self.l.insertStretch(-1)
-        
-    def set_collisions(self):
-        prev=self.collision.currentText()
-        self.collision.clear()
-        for o in collision_order:
-            if self.fileform.currentText() == 'epub' or o not in [UPDATE,UPDATEALWAYS]:
-                self.collision.addItem(o)
-        i = self.collision.findText(prev)
-        if i > -1:
-            self.collision.setCurrentIndex(i)
-        
-    def show_defaults(self):
-        text = get_resources('plugin-defaults.ini')
-        ShowDefaultsIniDialog(self.windowIcon(),text,self).exec_()
-        
-class PersonalIniTab(QWidget):
-
-    def __init__(self, parent_dialog, plugin_action):
-        self.parent_dialog = parent_dialog
-        self.plugin_action = plugin_action
-        QWidget.__init__(self)
-        
-        self.l = QVBoxLayout()
-        self.setLayout(self.l)
-
-        label = QLabel('These settings provide more detailed control over what metadata will be displayed inside the ebook as well as let you set is_adult and user/password for different sites.')
-        label.setWordWrap(True)
-        self.l.addWidget(label)
-        self.l.addSpacing(5)
-        
         self.label = QLabel('personal.ini:')
         self.l.addWidget(self.label)
 
         self.ini = QTextEdit(self)
-        try:
-            self.ini.setFont(QFont("Courier",
-                                   self.plugin_action.gui.font().pointSize()+1));
-        except Exception as e:
-            print("Couldn't get font: %s"%e)
         self.ini.setLineWrapMode(QTextEdit.NoWrap)
         self.ini.setText(prefs['personal.ini'])
         self.l.addWidget(self.ini)
@@ -304,13 +107,42 @@ class PersonalIniTab(QWidget):
         self.defaults.clicked.connect(self.show_defaults)
         self.l.addWidget(self.defaults)
         
-        # self.l.insertStretch(-1)
-        # let edit box fill the space.
+        reset_confirmation_button = QPushButton(_('Reset disabled &confirmation dialogs'), self)
+        reset_confirmation_button.setToolTip(_(
+                    'Reset all show me again dialogs for the FanFictionDownLoader plugin'))
+        reset_confirmation_button.clicked.connect(self.reset_dialogs)
+        self.l.addWidget(reset_confirmation_button)
+        
+    def save_settings(self):
+        prefs['fileform'] = unicode(self.fileform.currentText())
+        prefs['collision'] = unicode(self.collision.currentText())
+        prefs['updatemeta'] = self.updatemeta.isChecked()
+        prefs['urlsfromclip'] = self.urlsfromclip.isChecked()
+        prefs['updatedefault'] = self.updatedefault.isChecked()
+#        prefs['onlyoverwriteifnewer'] = self.onlyoverwriteifnewer.isChecked()
+        prefs['deleteotherforms'] = self.deleteotherforms.isChecked()
+        
+        ini = unicode(self.ini.toPlainText())
+        if ini:
+            prefs['personal.ini'] = ini
+        else:
+            # if they've removed everything, clear it so they get the
+            # default next time.
+            del prefs['personal.ini']
         
     def show_defaults(self):
-        text = get_resources('plugin-defaults.ini')
+        text = get_resources('defaults.ini')
         ShowDefaultsIniDialog(self.windowIcon(),text,self).exec_()
 
+    def reset_dialogs(self):
+        for key in dynamic.keys():
+            if key.startswith('fanfictiondownloader_') and key.endswith('_again') \
+                                                  and dynamic[key] is False:
+                dynamic[key] = True
+        info_dialog(self, _('Done'),
+                _('Confirmation dialogs have all been reset'), show=True)
+
+        
 class ShowDefaultsIniDialog(QDialog):
 
     def __init__(self, icon, text, parent=None):
@@ -319,18 +151,13 @@ class ShowDefaultsIniDialog(QDialog):
         self.l = QVBoxLayout()
         self.setLayout(self.l)
         self.label = QLabel("Plugin Defaults (Read-Only)")
-        self.label.setToolTip("These are all of the plugin's configurable options\nand their default settings.")
+        self.label.setToolTip("These all of the plugin's configurable settings\nand their default settings.")
         self.setWindowTitle(_('Plugin Defaults'))
         self.setWindowIcon(icon)
         self.l.addWidget(self.label)
         
         self.ini = QTextEdit(self)
-        self.ini.setToolTip("These are all of the plugin's configurable options\nand their default settings.")
-        try:
-            self.ini.setFont(QFont("Courier",
-                                   get_gui().font().pointSize()+1));
-        except Exception as e:
-            print("Couldn't get font: %s"%e)
+        self.ini.setToolTip("These all of the plugin's configurable settings\nand their default settings.")
         self.ini.setLineWrapMode(QTextEdit.NoWrap)
         self.ini.setText(text)
         self.ini.setReadOnly(True)
@@ -340,218 +167,3 @@ class ShowDefaultsIniDialog(QDialog):
         self.ok_button.clicked.connect(self.hide)
         self.l.addWidget(self.ok_button)
         
-class ListTab(QWidget):
-
-    def __init__(self, parent_dialog, plugin_action):
-        self.parent_dialog = parent_dialog
-        self.plugin_action = plugin_action
-        QWidget.__init__(self)
-        
-        self.l = QVBoxLayout()
-        self.setLayout(self.l)
-
-        try:
-            rl_plugin = plugin_action.gui.iactions['Reading List']
-            reading_lists = rl_plugin.get_list_names()
-        except KeyError:
-            reading_lists= []
-            
-        label = QLabel('These settings provide integration with the Reading List Plugin.  Reading List can automatically send to devices and change custom columns.  You have to create and configure the lists in Reading List to be useful.')
-        label.setWordWrap(True)
-        self.l.addWidget(label)
-        self.l.addSpacing(5)
-        
-        self.addtolists = QCheckBox('Add new/updated stories to "Send to Device" Reading List(s).',self)
-        self.addtolists.setToolTip('Automatically add new/updated stories to these lists in the Reading List plugin.')
-        self.addtolists.setChecked(prefs['addtolists'])
-        self.l.addWidget(self.addtolists)
-            
-        horz = QHBoxLayout()
-        label = QLabel('"Send to Device" Reading Lists')
-        label.setToolTip("When enabled, new/updated stories will be automatically added to these lists.")
-        horz.addWidget(label)        
-        self.send_lists_box = MultiCompleteLineEdit(self)
-        self.send_lists_box.setToolTip("When enabled, new/updated stories will be automatically added to these lists.")
-        self.send_lists_box.update_items_cache(reading_lists)
-        self.send_lists_box.setText(prefs['send_lists'])
-        horz.addWidget(self.send_lists_box)
-        self.l.addLayout(horz)
-        
-        self.addtoreadlists = QCheckBox('Add new/updated stories to "To Read" Reading List(s).',self)
-        self.addtoreadlists.setToolTip('Automatically add new/updated stories to these lists in the Reading List plugin.\nAlso offers menu option to remove stories from the "To Read" lists.')
-        self.addtoreadlists.setChecked(prefs['addtoreadlists'])
-        self.l.addWidget(self.addtoreadlists)
-            
-        horz = QHBoxLayout()
-        label = QLabel('"To Read" Reading Lists')
-        label.setToolTip("When enabled, new/updated stories will be automatically added to these lists.")
-        horz.addWidget(label)        
-        self.read_lists_box = MultiCompleteLineEdit(self)
-        self.read_lists_box.setToolTip("When enabled, new/updated stories will be automatically added to these lists.")
-        self.read_lists_box.update_items_cache(reading_lists)
-        self.read_lists_box.setText(prefs['read_lists'])
-        horz.addWidget(self.read_lists_box)
-        self.l.addLayout(horz)
-        
-        self.addtolistsonread = QCheckBox('Add stories back to "Send to Device" Reading List(s) when marked "Read".',self)
-        self.addtolistsonread.setToolTip('Menu option to remove from "To Read" lists will also add stories back to "Send to Device" Reading List(s)')
-        self.addtolistsonread.setChecked(prefs['addtolistsonread'])
-        self.l.addWidget(self.addtolistsonread)
-            
-        self.l.insertStretch(-1)
-        
-class OtherTab(QWidget):
-
-    def __init__(self, parent_dialog, plugin_action):
-        self.parent_dialog = parent_dialog
-        self.plugin_action = plugin_action
-        QWidget.__init__(self)
-        
-        self.l = QVBoxLayout()
-        self.setLayout(self.l)
-
-        label = QLabel("These controls aren't plugin settings as such, but convenience buttons for setting Keyboard shortcuts and getting all the FanFictionDownLoader confirmation dialogs back again.")
-        label.setWordWrap(True)
-        self.l.addWidget(label)
-        self.l.addSpacing(5)
-        
-        keyboard_shortcuts_button = QPushButton('Keyboard shortcuts...', self)
-        keyboard_shortcuts_button.setToolTip(_(
-                    'Edit the keyboard shortcuts associated with this plugin'))
-        keyboard_shortcuts_button.clicked.connect(parent_dialog.edit_shortcuts)
-        self.l.addWidget(keyboard_shortcuts_button)
-
-        reset_confirmation_button = QPushButton(_('Reset disabled &confirmation dialogs'), self)
-        reset_confirmation_button.setToolTip(_(
-                    'Reset all show me again dialogs for the FanFictionDownLoader plugin'))
-        reset_confirmation_button.clicked.connect(self.reset_dialogs)
-        self.l.addWidget(reset_confirmation_button)
-        
-        self.l.insertStretch(-1)
-        
-    def reset_dialogs(self):
-        for key in dynamic.keys():
-            if key.startswith('fanfictiondownloader_') and key.endswith('_again') \
-                                                  and dynamic[key] is False:
-                dynamic[key] = True
-        info_dialog(self, _('Done'),
-                    _('Confirmation dialogs have all been reset'),
-                    show=True,
-                    show_copy_button=False)
-
-permitted_values = {
-    'int' : ['numWords','numChapters'],
-    'float' : ['numWords','numChapters'],
-    'bool' : ['status-C','status-I'],
-    'datetime' : ['datePublished', 'dateUpdated', 'dateCreated'],
-    'series' : ['series'],
-    'enumeration' : ['category',
-                     'genre',
-                     'language',
-                     'series',
-                     'characters',
-                     'status',
-                     'datePublished',
-                     'dateUpdated',
-                     'dateCreated',
-                     'rating',
-                     'warnings',
-                     'numChapters',
-                     'numWords',
-                     'site',
-                     'storyId',
-                     'authorId',
-                     'extratags',
-                     'title',
-                     'storyUrl',
-                     'description',
-                     'author',
-                     'authorUrl',
-                     'formatname'
-                     #,'formatext'   # not useful information.
-                     #,'siteabbrev'
-                     #,'version'
-                     ]
-    }
-# no point copying the whole list.
-permitted_values['text'] = permitted_values['enumeration']
-permitted_values['comments'] = permitted_values['enumeration']
-
-titleLabels = {
-    'category':'Category',
-    'genre':'Genre',
-    'language':'Language',
-    'status':'Status',
-    'status-C':'Status:Completed',
-    'status-I':'Status:In-Progress',
-    'series':'Series',
-    'characters':'Characters',
-    'datePublished':'Published',
-    'dateUpdated':'Updated',
-    'dateCreated':'Packaged',
-    'rating':'Rating',
-    'warnings':'Warnings',
-    'numChapters':'Chapters',
-    'numWords':'Words',
-    'site':'Site',
-    'storyId':'Story ID',
-    'authorId':'Author ID',
-    'extratags':'Extra Tags',
-    'title':'Title',
-    'storyUrl':'Story URL',
-    'description':'Summary',
-    'author':'Author',
-    'authorUrl':'Author URL',
-    'formatname':'File Format',
-    'formatext':'File Extension',
-    'siteabbrev':'Site Abbrev',
-    'version':'FFDL Version'
-    }
-
-class ColumnsTab(QWidget):
-
-    def __init__(self, parent_dialog, plugin_action):
-        self.parent_dialog = parent_dialog
-        self.plugin_action = plugin_action
-        QWidget.__init__(self)
-        
-        self.l = QVBoxLayout()
-        self.setLayout(self.l)
-
-        label = QLabel("If you have custom columns defined, they will be listed below.  Choose a metadata value type to fill your columns automatically.")
-        label.setWordWrap(True)
-        self.l.addWidget(label)
-        self.l.addSpacing(5)
-        
-        self.custcol_dropdowns = {}
-
-        custom_columns = self.plugin_action.gui.library_view.model().custom_columns
-
-        for key, column in custom_columns.iteritems():
-
-            if column['datatype'] in permitted_values:
-                # print("\n============== %s ===========\n"%key)
-                # for (k,v) in column.iteritems():
-                #     print("column['%s'] => %s"%(k,v))
-                horz = QHBoxLayout()
-                label = QLabel('%s(%s)'%(column['name'],key))
-                label.setToolTip("Update this %s column with..."%column['datatype'])
-                horz.addWidget(label)
-                dropdown = QComboBox(self)
-                dropdown.addItem('',QVariant('none'))
-                for md in permitted_values[column['datatype']]:
-                    dropdown.addItem(titleLabels[md],QVariant(md))
-                self.custcol_dropdowns[key] = dropdown
-                if key in prefs['custom_cols']:
-                    dropdown.setCurrentIndex(dropdown.findData(QVariant(prefs['custom_cols'][key])))
-                if column['datatype'] == 'enumeration':
-                    dropdown.setToolTip("Metadata values valid for this type of column.\nValues that aren't valid for this enumeration column will be ignored.")
-                else:
-                    dropdown.setToolTip("Metadata values valid for this type of column.")
-
-                horz.addWidget(dropdown)
-                self.l.addLayout(horz)
-        
-        self.l.insertStretch(-1)
-
-        #print("prefs['custom_cols'] %s"%prefs['custom_cols'])

calibre-plugin/dcsource.py

@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import (unicode_literals, division, absolute_import,
-                        print_function)
-
-__license__   = 'GPL v3'
-__copyright__ = '2012, Jim Miller'
-__docformat__ = 'restructuredtext en'
-
-from zipfile import ZipFile
-
-from xml.dom.minidom import parseString
-
-def get_dcsource(inputio):
-    epub = ZipFile(inputio, 'r')
-
-    ## Find the .opf file.
-    container = epub.read("META-INF/container.xml")
-    containerdom = parseString(container)
-    rootfilenodelist = containerdom.getElementsByTagName("rootfile")
-    rootfilename = rootfilenodelist[0].getAttribute("full-path")
-
-    metadom = parseString(epub.read(rootfilename))
-    firstmetadom = metadom.getElementsByTagName("metadata")[0]
-    try:
-        source=firstmetadom.getElementsByTagName("dc:source")[0].firstChild.data.encode("utf-8")
-    except:
-        source=None
-
-    return source

calibre-plugin/dialogs.py

@@ -11,16 +11,13 @@ import traceback
 
 from PyQt4 import QtGui
 from PyQt4.Qt import (QDialog, QTableWidget, QMessageBox, QVBoxLayout, QHBoxLayout, QGridLayout,
-                      QPushButton, QProgressDialog, QString, QLabel, QCheckBox, QIcon, QTextCursor,
+                      QPushButton, QProgressDialog, QString, QLabel, QCheckBox, QIcon,
                       QTextEdit, QLineEdit, QInputDialog, QComboBox, QClipboard, QVariant,
                       QProgressDialog, QTimer, QDialogButtonBox, QPixmap, Qt,QAbstractItemView )
 
 from calibre.gui2 import error_dialog, warning_dialog, question_dialog, info_dialog
 from calibre.gui2.dialogs.confirm_delete import confirm
 
-from calibre import confirm_config_name
-from calibre.gui2 import dynamic
-
 from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader import adapters,writers,exceptions
 from calibre_plugins.fanfictiondownloader_plugin.common_utils \
     import (ReadOnlyTableWidgetItem, ReadOnlyTextIconWidgetItem, SizePersistedDialog,
@@ -48,23 +45,7 @@ class NotGoingToDownload(Exception):
 
     def __str__(self):
         return self.error
-
-class DroppableQTextEdit(QTextEdit):
-    def __init__(self,parent):
-        QTextEdit.__init__(self,parent)
-        
-    def canInsertFromMimeData(self, source):
-        if source.hasUrls():
-            return True;
-        else:
-            return QTextEdit.canInsertFromMimeData(self,source)
-
-    def insertFromMimeData(self, source):
-        if source.hasText():
-            self.append(source.text())
-        else:
-            return QTextEdit.insertFromMimeData(self, source)
-                            
+    
 class AddNewDialog(SizePersistedDialog):
 
     def __init__(self, gui, prefs, icon, url_list_text):
@@ -79,12 +60,21 @@ class AddNewDialog(SizePersistedDialog):
         self.setWindowIcon(icon)
 
         self.l.addWidget(QLabel('Story URL(s), one per line:'))
-        self.url = DroppableQTextEdit(self)
+        self.url = QTextEdit(self)
         self.url.setToolTip('URLs for stories, one per line.\nWill take URLs from clipboard, but only valid URLs.')
         self.url.setLineWrapMode(QTextEdit.NoWrap)
         self.url.setText(url_list_text)
         self.l.addWidget(self.url)
         
+        # self.ffdl_button = QPushButton(
+        #     'Download Stories', self)
+        # self.ffdl_button.setToolTip('Start download(s).')
+        # self.ffdl_button.clicked.connect(self.ffdl)
+        # # if there's already URL(s), focus 'go' button
+        # if url_list_text:
+        #     self.ffdl_button.setFocus()
+        # self.l.addWidget(self.ffdl_button)
+
         horz = QHBoxLayout()
         label = QLabel('Output &Format:')
         horz.addWidget(label)
@@ -95,8 +85,6 @@ class AddNewDialog(SizePersistedDialog):
         self.fileform.addItem('txt')
         self.fileform.setCurrentIndex(self.fileform.findText(prefs['fileform']))
         self.fileform.setToolTip('Choose output format to create.  May set default from plugin configuration.')
-        self.fileform.activated.connect(self.set_collisions)
-        
         label.setBuddy(self.fileform)
         horz.addWidget(self.fileform)
         self.l.addLayout(horz)
@@ -107,10 +95,10 @@ class AddNewDialog(SizePersistedDialog):
         horz.addWidget(label)
         self.collision = QComboBox(self)
         # add collision options
-        self.set_collisions()
-        i = self.collision.findText(prefs['collision'])
-        if i > -1:
-            self.collision.setCurrentIndex(i)
+        for o in collision_order:
+            self.collision.addItem(o)
+
+        self.collision.setCurrentIndex(self.collision.findText(prefs['collision']))
         # self.collision.setToolTip(OVERWRITE+' will replace the existing story.\n'+
         #                           UPDATE+' will download new chapters only and add to existing EPUB.\n'+
         #                           ADDNEW+' will create a new story with the same title and author.\n'+
@@ -125,6 +113,22 @@ class AddNewDialog(SizePersistedDialog):
         self.updatemeta.setChecked(prefs['updatemeta'])
         self.l.addWidget(self.updatemeta)
 
+        # self.onlyoverwriteifnewer = QCheckBox('Only Overwrite Story if Newer',self)
+        # self.onlyoverwriteifnewer.setToolTip("Don't overwrite existing book unless the story on the web site is newer.\n"+
+        #                                      "From the same day counts as 'newer' because the sites don't give update time.")
+        # self.onlyoverwriteifnewer.setChecked(prefs['onlyoverwriteifnewer'])
+        # self.l.addWidget(self.onlyoverwriteifnewer)
+        
+        # horz = QHBoxLayout()
+        # self.about_button = QPushButton('About', self)
+        # self.about_button.clicked.connect(self.about)
+        # horz.addWidget(self.about_button)
+        # self.conf_button = QPushButton(
+        #         'Configure this plugin', self)
+        # self.conf_button.clicked.connect(self.config)
+        # horz.addWidget(self.conf_button)
+        # self.l.addLayout(horz)
+
         button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         button_box.accepted.connect(self.accept)
         button_box.rejected.connect(self.reject)
@@ -132,26 +136,15 @@ class AddNewDialog(SizePersistedDialog):
         
         if url_list_text:
             button_box.button(QDialogButtonBox.Ok).setFocus()
-
-        # restore saved size.
+        
         self.resize_dialog()
         #self.resize(self.sizeHint())
 
-    def set_collisions(self):
-        prev=self.collision.currentText()
-        self.collision.clear()
-        for o in collision_order:
-            if self.fileform.currentText() == 'epub' or o not in [UPDATE,UPDATEALWAYS]:
-                self.collision.addItem(o)
-        i = self.collision.findText(prev)
-        if i > -1:
-            self.collision.setCurrentIndex(i)
-        
     def get_ffdl_options(self):
         return {
             'fileform': unicode(self.fileform.currentText()),
             'collision': unicode(self.collision.currentText()),
-            'updatemeta': self.updatemeta.isChecked(),
+            'updatemeta': unicode(self.updatemeta.isChecked()),
             }
 
     def get_urlstext(self):
@@ -178,7 +171,6 @@ class UserPassDialog(QDialog):
    
         self.l.addWidget(QLabel("Password:"),2,0)
         self.passwd = QLineEdit(self)
-        self.passwd.setEchoMode(QLineEdit.Password)
         self.l.addWidget(self.passwd,2,1)
    
         self.ok_button = QPushButton('OK', self)
@@ -199,27 +191,25 @@ class UserPassDialog(QDialog):
         self.status=False
         self.hide()
 
-class LoopProgressDialog(QProgressDialog):
+class MetadataProgressDialog(QProgressDialog):
     '''
     ProgressDialog displayed while fetching metadata for each story.
     '''
     def __init__(self, gui,
                  book_list,
-                 foreach_function,
-                 finish_function,
-                 init_label="Fetching metadata for stories...",
-                 win_title="Downloading metadata for stories",
-                 status_prefix="Fetched metadata for"):
+                 options,
+                 metadata_function,
+                 startdownload_function):
         QProgressDialog.__init__(self,
-                                 init_label,
+                                 "Fetching metadata for stories...",
                                  QString(), 0, len(book_list), gui)
-        self.setWindowTitle(win_title)
+        self.setWindowTitle("Downloading metadata for stories")
         self.setMinimumWidth(500)
         self.gui = gui
         self.book_list = book_list
-        self.foreach_function = foreach_function
-        self.finish_function = finish_function
-        self.status_prefix = status_prefix
+        self.options = options
+        self.metadata_function = metadata_function
+        self.startdownload_function = startdownload_function
         self.i = 0
         
         ## self.do_loop does QTimer.singleShot on self.do_loop also.
@@ -228,11 +218,12 @@ class LoopProgressDialog(QProgressDialog):
         self.exec_()
 
     def updateStatus(self):
-        self.setLabelText("%s %d of %d"%(self.status_prefix,self.i+1,len(self.book_list)))
+        self.setLabelText("Fetched metadata for %d of %d"%(self.i+1,len(self.book_list)))
         self.setValue(self.i+1)
         print(self.labelText())
 
     def do_loop(self):
+        print("self.i:%d"%self.i)
 
         if self.i == 0:
             self.setValue(0)
@@ -241,7 +232,7 @@ class LoopProgressDialog(QProgressDialog):
         try:
             ## collision spec passed into getadapter by partial from ffdl_plugin
             ## no retval only if it exists, but collision is SKIP
-            self.foreach_function(book)
+            self.metadata_function(book)
             
         except NotGoingToDownload as d:
             book['good']=False
@@ -251,8 +242,9 @@ class LoopProgressDialog(QProgressDialog):
         except Exception as e:
             book['good']=False
             book['comment']=unicode(e)
-            print("Exception: %s:%s"%(book,unicode(e)))
-            traceback.print_exc()
+            print("%s:%s"%(book,unicode(e)))
+            # XXX trace for not-expected exceptions
+            #traceback.print_exc()
             
         self.updateStatus()
         self.i += 1
@@ -266,7 +258,7 @@ class LoopProgressDialog(QProgressDialog):
         self.hide()
         self.gui = None        
         # Queues a job to process these books in the background.
-        self.finish_function(self.book_list)
+        self.startdownload_function(self.book_list)
 
 class AboutDialog(QDialog):
 
@@ -311,7 +303,7 @@ class AuthorTableWidgetItem(ReadOnlyTableWidgetItem):
 
 class UpdateExistingDialog(SizePersistedDialog):
     def __init__(self, gui, header, prefs, icon, books,
-                 save_size_name='fanfictiondownloader_plugin:update list dialog'):
+                 save_size_name='FanFictionDownLoader plugin:update list dialog'):
         SizePersistedDialog.__init__(self, gui, save_size_name)
         self.gui = gui
         
@@ -362,7 +354,6 @@ class UpdateExistingDialog(SizePersistedDialog):
         self.fileform.addItem('txt')
         self.fileform.setCurrentIndex(self.fileform.findText(prefs['fileform']))
         self.fileform.setToolTip('Choose output format to create.  May set default from plugin configuration.')
-        self.fileform.activated.connect(self.set_collisions)
         label.setBuddy(self.fileform)
         options_layout.addWidget(self.fileform)
         
@@ -370,11 +361,10 @@ class UpdateExistingDialog(SizePersistedDialog):
         label.setToolTip("What sort of update to perform.  May set default from plugin configuration.")
         options_layout.addWidget(label)
         self.collision = QComboBox(self)
-        # add collision options
-        self.set_collisions()
-        i = self.collision.findText(prefs['collision'])
-        if i > -1:
-            self.collision.setCurrentIndex(i)
+        for o in collision_order:
+            if o not in [ADDNEW,SKIP]:
+                self.collision.addItem(o)
+        self.collision.setCurrentIndex(self.collision.findText(prefs['collision']))
         # self.collision.setToolTip('Overwrite will replace the existing story.  Add New will create a new story with the same title and author.')
         label.setBuddy(self.collision)
         options_layout.addWidget(self.collision)
@@ -394,17 +384,6 @@ class UpdateExistingDialog(SizePersistedDialog):
         # Cause our dialog size to be restored from prefs or created on first usage
         self.resize_dialog()
         self.books_table.populate_table(books)
-
-    def set_collisions(self):
-        prev=self.collision.currentText()
-        self.collision.clear()
-        for o in collision_order:
-            if o not in [ADDNEW,SKIP] and \
-                    (self.fileform.currentText() == 'epub' or o not in [UPDATE,UPDATEALWAYS]):
-                self.collision.addItem(o)        
-        i = self.collision.findText(prev)
-        if i > -1:
-            self.collision.setCurrentIndex(i)
         
     def remove_from_list(self):
         self.books_table.remove_selected_rows()
@@ -416,38 +395,17 @@ class UpdateExistingDialog(SizePersistedDialog):
         return {
             'fileform': unicode(self.fileform.currentText()),
             'collision': unicode(self.collision.currentText()),
-            'updatemeta': self.updatemeta.isChecked(),
+            'updatemeta': unicode(self.updatemeta.isChecked()),
             }
 
-def display_story_list(gui, header, prefs, icon, books,
-                       label_text='',
-                       save_size_name='fanfictiondownloader_plugin:display list dialog',
-                       offer_skip=False):
-    all_good = True
-    for b in books:
-        if not b['good']:
-            all_good=False
-            break
-        
-    ## 
-    if all_good and not dynamic.get(confirm_config_name(save_size_name), True):
-        return True
-        pass
-            ## fake accept?
-    d = DisplayStoryListDialog(gui, header, prefs, icon, books,
-                               label_text,
-                               save_size_name,
-                               offer_skip and all_good)
-    d.exec_()
-    return d.result() == d.Accepted
-
 class DisplayStoryListDialog(SizePersistedDialog):
     def __init__(self, gui, header, prefs, icon, books,
                  label_text='',
-                 save_size_name='fanfictiondownloader_plugin:display list dialog',
-                 offer_skip=False):
+                 save_size_name='FanFictionDownLoader plugin:display list dialog'):
         SizePersistedDialog.__init__(self, gui, save_size_name)
-        self.name = save_size_name
+        # UpdateExistingDialog.__init__(self, gui, header, prefs, icon, books,
+        #                               save_size_name='FanFictionDownLoader plugin:display list dialog')
+
         self.gui = gui
         
         self.setWindowTitle(header)
@@ -468,15 +426,6 @@ class DisplayStoryListDialog(SizePersistedDialog):
         #self.label.setWordWrap(True)
         options_layout.addWidget(self.label)
         
-        if offer_skip:
-            spacerItem1 = QtGui.QSpacerItem(2, 4, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-            options_layout.addItem(spacerItem1)
-            self.again = QCheckBox('Show this again?',self)
-            self.again.setChecked(True)
-            self.again.stateChanged.connect(self.toggle)
-            self.again.setToolTip('Uncheck to skip review and update stories immediately when no problems.')
-            options_layout.addWidget(self.again)
-        
         button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         button_box.accepted.connect(self.accept)
         button_box.rejected.connect(self.reject)
@@ -488,15 +437,10 @@ class DisplayStoryListDialog(SizePersistedDialog):
         # Cause our dialog size to be restored from prefs or created on first usage
         self.resize_dialog()
         self.books_table.populate_table(books)
-
+        
     def get_books(self):
         return self.books_table.get_books()
 
-    def toggle(self, *args):
-        dynamic[confirm_config_name(self.name)] = self.again.isChecked()
-
-    
-
 class StoryListTableWidget(QTableWidget):
 
     def __init__(self, parent):
@@ -563,12 +507,26 @@ class StoryListTableWidget(QTableWidget):
         #comment_cell.setData(Qt.UserRole, QVariant(book))
         self.setItem(row, 4, comment_cell)
 
+    # def get_calibre_ids(self):
+    #     ids = []
+    #     for row in range(self.rowCount()):
+    #         ids.append(self.item(row, 1).data(Qt.UserRole).toPyObject())
+    #     return ids
+
+    # def get_urls(self):
+    #     urls = []
+    #     for row in range(self.rowCount()):
+    #         urls.append(self.item(row, 2).data(Qt.UserRole).toPyObject())
+    #     return urls
+
     def get_books(self):
         books = []
         #print("=========================\nbooks:%s"%self.books)
         for row in range(self.rowCount()):
             rnum = self.item(row, 1).data(Qt.UserRole).toPyObject()
+            #print("get_books rnum:%s"%rnum)
             book = self.books[rnum]
+            #if book['good']:
             books.append(book)
         return books
 

calibre-plugin/ffdl_plugin.py

@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2012, Jim Miller'
 __docformat__ = 'restructuredtext en'
 
-import time, os, copy, threading
+import time, os
 from ConfigParser import SafeConfigParser
 from StringIO import StringIO
 from functools import partial
@@ -19,9 +19,6 @@ from calibre.ptempfile import PersistentTemporaryFile, PersistentTemporaryDirect
 from calibre.ebooks.metadata import MetaInformation, authors_to_string
 from calibre.ebooks.metadata.meta import get_metadata
 from calibre.gui2 import error_dialog, warning_dialog, question_dialog, info_dialog
-from calibre.gui2.dialogs.message_box import ViewLog
-from calibre.gui2.dialogs.confirm_delete import confirm
-from calibre.utils.date import local_tz
 
 # The class that all interface action plugins must inherit from
 from calibre.gui2.actions import InterfaceAction
@@ -31,12 +28,11 @@ from calibre_plugins.fanfictiondownloader_plugin.common_utils import (set_plugin
 
 from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader import adapters, writers, exceptions
 from calibre_plugins.fanfictiondownloader_plugin.epubmerge import doMerge
-from calibre_plugins.fanfictiondownloader_plugin.dcsource import get_dcsource
 
-from calibre_plugins.fanfictiondownloader_plugin.config import (prefs, permitted_values)
+from calibre_plugins.fanfictiondownloader_plugin.config import (prefs)
 from calibre_plugins.fanfictiondownloader_plugin.dialogs import (
-    AddNewDialog, UpdateExistingDialog, display_story_list, DisplayStoryListDialog,
-    LoopProgressDialog, UserPassDialog, AboutDialog,
+    AddNewDialog, UpdateExistingDialog, DisplayStoryListDialog,
+    MetadataProgressDialog, UserPassDialog, AboutDialog,
     OVERWRITE, OVERWRITEALWAYS, UPDATE, UPDATEALWAYS, ADDNEW, SKIP, CALIBREONLY,
     NotGoingToDownload )
 
@@ -63,8 +59,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
     # (text, icon_path, tooltip, keyboard shortcut)
     # icon_path isn't in the zip--icon loaded below.
     action_spec = (name, None,
-                   'Download FanFiction stories from various web sites', ())
-    # None for keyboard shortcut doesn't allow shortcut.  () does, there just isn't one yet
+                   'Download FanFiction stories from various web sites', None)
 
     action_type = 'global'
     # make button menu drop down only
@@ -78,8 +73,11 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         icon_resources = self.load_resources(PLUGIN_ICONS)
         set_plugin_icon_resources(self.name, icon_resources)
         
-        base = self.interface_action_base_plugin
-        self.version = base.name+" v%d.%d.%d"%base.version
+        # Show the config dialog
+        # The config dialog can also be shown from within
+        # Preferences->Plugins, which is why the do_user_config
+        # method is defined on the base plugin class
+        do_user_config = self.interface_action_base_plugin.do_user_config
 
         # Set the icon for this interface action
         # The get_icons function is a builtin function defined for all your
@@ -102,107 +100,38 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
 
         # Assign our menu to this action
         self.menu = QMenu(self.gui)
-        self.old_actions_unique_map = {}
         self.qaction.setMenu(self.menu)
+
         self.menu.aboutToShow.connect(self.about_to_show_menu)
 
-        self.menus_lock = threading.RLock()
+        self.actions_unique_map = {}
+
+        self.add_action = self.create_menu_item_ex(self.menu, '&Add New from URL(s)', image='plus.png',
+                                                   unique_name='Add New FanFiction Book(s) from URL(s)',
+                                                   shortcut_name='Add New FanFiction Book(s) from URL(s)',
+                                                   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) #partial(self._update_existing,'qwerty'))
+
+        self.menu.addSeparator()
+        self.config_action = create_menu_action_unique(self, self.menu, '&Configure Plugin', shortcut=False,
+                                                       image= 'config.png',
+                                                       unique_name='Configure FanFictionDownLoader',
+                                                       shortcut_name='Configure FanFictionDownLoader',
+                                                       triggered=partial(do_user_config,parent=self.gui))
+
+        self.config_action = create_menu_action_unique(self, self.menu, '&About Plugin', shortcut=False,
+                                                       image= 'images/icon.png',
+                                                       unique_name='About FanFictionDownLoader',
+                                                       shortcut_name='About FanFictionDownLoader',
+                                                       triggered=self.about)
 
-    def initialization_complete(self):
-        # otherwise configured hot keys won't work until the menu's
-        # been displayed once.
-        self.rebuild_menus()
 
     def about_to_show_menu(self):
-        self.rebuild_menus()
-
-    def library_changed(self, db):
-        # We need to reset our menus after switching libraries
-        self.rebuild_menus()
-        
-    def rebuild_menus(self):
-        with self.menus_lock:
-            # Show the config dialog
-            # The config dialog can also be shown from within
-            # Preferences->Plugins, which is why the do_user_config
-            # method is defined on the base plugin class
-            do_user_config = self.interface_action_base_plugin.do_user_config
-            self.menu.clear()
-            self.actions_unique_map = {}
-            self.add_action = self.create_menu_item_ex(self.menu, '&Add New from URL(s)', image='plus.png',
-                                                       unique_name='Add New FanFiction Book(s) from URL(s)',
-                                                       shortcut_name='Add New FanFiction Book(s) from URL(s)',
-                                                       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']) :
-                self.menu.addSeparator()
-                addmenutxt, rmmenutxt = None, None
-                if prefs['addtolists'] and prefs['addtoreadlists'] :
-                    addmenutxt = 'Add to "To Read" and "Send to Device" Lists'
-                    if prefs['addtolistsonread']:
-                        rmmenutxt = 'Remove from "To Read" and add to "Send to Device" Lists'
-                    else:
-                        rmmenutxt = 'Remove from "To Read" Lists'
-                elif prefs['addtolists'] :
-                    addmenutxt = 'Add Selected to "Send to Device" Lists'
-                elif prefs['addtoreadlists']:
-                    addmenutxt = 'Add to "To Read" Lists'
-                    rmmenutxt = 'Remove from "To Read" Lists'
-
-                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))
-                
-                # try:
-                #     self.add_send_action.setEnabled( len(self.gui.library_view.get_selected_ids()) > 0 )
-                # except:
-                #     pass
-                # try:
-                #     self.add_remove_action.setEnabled( len(self.gui.library_view.get_selected_ids()) > 0 )
-                # except:
-                #     pass
-
-            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.menu.addSeparator()
-            self.config_action = create_menu_action_unique(self, self.menu, '&Configure Plugin', shortcut=False,
-                                                           image= 'config.png',
-                                                           unique_name='Configure FanFictionDownLoader',
-                                                           shortcut_name='Configure FanFictionDownLoader',
-                                                           triggered=partial(do_user_config,parent=self.gui))
-            
-            self.config_action = create_menu_action_unique(self, self.menu, '&About Plugin', shortcut=False,
-                                                           image= 'images/icon.png',
-                                                           unique_name='About FanFictionDownLoader',
-                                                           shortcut_name='About FanFictionDownLoader',
-                                                           triggered=self.about)
-            
-            # self.update_action.setEnabled( len(self.gui.library_view.get_selected_ids()) > 0 )
-            # self.get_list_action.setEnabled( len(self.gui.library_view.get_selected_ids()) > 0 )
-
-            # 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():
-                if menu_id not in self.actions_unique_map:
-                    self.gui.keyboard.unregister_shortcut(unique_name)
-            self.old_actions_unique_map = self.actions_unique_map
-            self.gui.keyboard.finalize()            
+        self.update_action.setEnabled( len(self.gui.library_view.get_selected_ids()) > 0 )
 
     def about(self):
         # Get the about text from a file inside the plugin zip file
@@ -214,9 +143,10 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         # should pass a list of names to get_resources. In this case,
         # get_resources will return a dictionary mapping names to bytes. Names that
         # are not found in the zip file will not be in the returned dictionary.
-        
         text = get_resources('about.txt')
-        AboutDialog(self.gui,self.qaction.icon(),self.version + text).exec_()
+#        QMessageBox.about(self, 'About the FanFictionDownLoader Plugin',
+ #               text.decode('utf-8'))
+        AboutDialog(self.gui,self.qaction.icon(),text).exec_()
         
     def create_menu_item_ex(self, parent_menu, menu_text, image=None, tooltip=None,
                            shortcut=None, triggered=None, is_checked=None, shortcut_name=None,
@@ -231,44 +161,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
             self.update_existing()
         else:
             self.add_dialog()
-
-    def update_lists(self,add=True):
-        if len(self.gui.library_view.get_selected_ids()) > 0 and \
-                (prefs['addtolists'] or prefs['addtoreadlists']) :
-            self._update_reading_lists(self.gui.library_view.get_selected_ids(),add)
-        #self.gui.library_view.model().refresh_ids(self.gui.library_view.get_selected_ids())
-
-    def get_list_urls(self):
-        if len(self.gui.library_view.get_selected_ids()) > 0:
-            book_list = map( partial(self._convert_id_to_book, good=False), self.gui.library_view.get_selected_ids() )
-
-            LoopProgressDialog(self.gui,
-                               book_list,
-                               partial(self._get_story_url_for_list, db=self.gui.current_db),
-                               self._finish_get_list_urls,
-                               init_label="Collecting URLs for stories...",
-                               win_title="Get URLs for stories",
-                               status_prefix="URL retrieved")
-            
-    def _get_story_url_for_list(self,book,db=None):
-        book['url'] = self._get_story_url(db,book['calibre_id'])
-        if book['url'] == None:
-            book['good']=False
-        else:
-            book['good']=True
-            
-    def _finish_get_list_urls(self, book_list):
-        url_list = [ x['url'] for x in book_list if x['good'] ]
-        if url_list:
-            d = ViewLog(_("List of URLs"),"\n".join(url_list),parent=self.gui)
-            d.setWindowIcon(get_icon('bookmarks.png'))
-            d.exec_()
-        else:
-            info_dialog(self.gui, _('List of URLs'),
-                        _('No URLs found in selected books.'),
-                        show=True,
-                        show_copy_button=False)
-                
+    
     def add_dialog(self):
 
         #print("add_dialog()")
@@ -294,39 +187,21 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         #print("add_books:%s"%add_books)
         #print("options:%s"%d.get_ffdl_options())
 
-        options = d.get_ffdl_options()
-        options['version'] = self.version
-        print(self.version)
-        
-        self.start_downloads( options, add_books )
+        self.start_downloads( d.get_ffdl_options(),add_books )
         
     def update_existing(self):
-        if len(self.gui.library_view.get_selected_ids()) == 0:
-            return
         #print("update_existing()")
-        
+        previous = self.gui.library_view.currentIndex()
         db = self.gui.current_db
-        book_list = map( partial(self._convert_id_to_book, good=False), self.gui.library_view.get_selected_ids() )
-        #book_ids = self.gui.library_view.get_selected_ids()
-
-        LoopProgressDialog(self.gui,
-                           book_list,
-                           partial(self._populate_book_from_calibre_id, db=self.gui.current_db),
-                           self._update_existing_2,
-                           init_label="Collecting stories for update...",
-                           win_title="Get stories for updates",
-                           status_prefix="URL retrieved")            
-        
-        #books = self._convert_calibre_ids_to_books(db, book_ids)
+        book_ids = self.gui.library_view.get_selected_ids()
+        books = self._convert_calibre_ids_to_books(db, book_ids)
         #print("update books:%s"%books)
 
-    def _update_existing_2(self,book_list):
-        
         d = UpdateExistingDialog(self.gui,
                                  'Update Existing List',
                                  prefs,
                                  self.qaction.icon(),
-                                 book_list,
+                                 books,
                                  )
         d.exec_()
         if d.result() != d.Accepted:
@@ -338,10 +213,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         #print("options:%s"%d.get_ffdl_options())
         # only if there's some good ones.
         if 0 < len(filter(lambda x : x['good'], update_books)):
-            options = d.get_ffdl_options()
-            options['version'] = self.version
-            print(self.version)
-            self.start_downloads( options, update_books )
+            self.start_downloads( d.get_ffdl_options(), update_books )
         
     def get_urls_clip(self):
         url_list = []
@@ -365,14 +237,14 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
 
         self.gui.status_bar.show_message(_('Started fetching metadata for %s stories.'%len(books)), 3000)
         
-        if 0 < len(filter(lambda x : x['good'], books)):
-            LoopProgressDialog(self.gui,
+        MetadataProgressDialog(self.gui,
                                books,
+                               options,
                                partial(self.get_metadata_for_book, options = options),
                                partial(self.start_download_list, options = options))
-        # LoopProgressDialog calls get_metadata_for_book for each 'good' story,
+        # MetadataProgressDialog calls get_metadata_for_book for each 'good' story,
         # get_metadata_for_book updates book for each,
-        # LoopProgressDialog calls start_download_list at the end which goes
+        # MetadataProgressDialog calls start_download_list at the end which goes
         # into the BG, or shows list if no 'good' books.
 
     def get_metadata_for_book(self,book,
@@ -381,7 +253,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
                                        'updatemeta':True}):
         '''
         Update passed in book dict with metadata from website and
-        necessary data.  To be called from LoopProgressDialog
+        necessary data.  To be called from MetadataProgressDialog
         'loop'.  Also pops dialogs for is adult, user/pass.
         '''
         
@@ -400,48 +272,43 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
             return
         
         url = book['url']
-        print("url:%s"%url)
-        skip_date_update = False
         
         ## was self.ffdlconfig, but we need to be able to change it
         ## when doing epub update.
         ffdlconfig = SafeConfigParser()
-        ffdlconfig.readfp(StringIO(get_resources("plugin-defaults.ini")))
+        ffdlconfig.readfp(StringIO(get_resources("defaults.ini")))
         ffdlconfig.readfp(StringIO(prefs['personal.ini']))
         adapter = adapters.getAdapter(ffdlconfig,url)
 
         options['personal.ini'] = prefs['personal.ini']
 
-        ## three tries, that's enough if both user/pass & is_adult needed,
-        ## or a couple tries of one or the other
-        for x in range(0,2):
-            try:
-                adapter.getStoryMetadataOnly()
-            except exceptions.FailedToLogin:
-                print("Login Failed, Need Username/Password.")
-                userpass = UserPassDialog(self.gui,url)
-                userpass.exec_() # exec_ will make it act modal
-                if userpass.status:
-                    adapter.username = userpass.user.text()
-                    adapter.password = userpass.passwd.text()
+        try:
+            adapter.getStoryMetadataOnly()
+        except exceptions.FailedToLogin:
+            print("Login Failed, Need Username/Password.")
+            userpass = UserPassDialog(self.gui,url)
+            userpass.exec_() # exec_ will make it act modal
+            if userpass.status:
+                adapter.username = userpass.user.text()
+                adapter.password = userpass.passwd.text()
                 
-            except exceptions.AdultCheckRequired:
-                if question_dialog(self.gui, 'Are You Adult?', '<p>'+
-                                   "%s requires that you be an adult.  Please confirm you are an adult in your locale:"%url,
-                                   show_copy_button=False):
-                    adapter.is_adult=True
+        except exceptions.AdultCheckRequired:
+            if question_dialog(self.gui, 'Are You Adult?', '<p>'+
+                               "%s requires that you be an adult.  Please confirm you are an adult in your locale:"%url,
+                               show_copy_button=False):
+                adapter.is_adult=True
 
         # let other exceptions percolate up.
         story = adapter.getStoryMetadataOnly()
         writer = writers.getWriter(options['fileform'],adapter.config,adapter)
 
-        book['all_metadata'] = story.getAllMetadata(removeallentities=True)
         book['title'] = story.getMetadata("title", removeallentities=True)
         book['author_sort'] = book['author'] = story.getMetadata("author", removeallentities=True)
         book['publisher'] = story.getMetadata("site")
         book['tags'] = writer.getTags()
+        book['pubdate'] = story.getMetadataRaw('datePublished')
+        book['timestamp'] = story.getMetadataRaw('dateCreated')
         book['comments'] = story.getMetadata("description") #, removeallentities=True) comments handles entities better.
-        book['series'] = story.getMetadata("series")
         
         # adapter.opener is the element with a threadlock.  But del
         # adapter.opener doesn't work--subproc fails when it tries
@@ -453,16 +320,12 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         book['password'] = adapter.password
 
         book['icon'] = 'plus.png'
-        if story.getMetadataRaw('datePublished'):
-            # should only happen when an adapter is broken, but better to
-            # fail gracefully.
-            book['pubdate'] = story.getMetadataRaw('datePublished').replace(tzinfo=local_tz)
-        book['timestamp'] = None # filled below if not skipped.
         
         if collision in (CALIBREONLY):
             book['icon'] = 'metadata.png'
         
-        # Dialogs should prevent this case now.
+        # XXX should really do a 'you can't do that' dialog when they
+        # hit 'OK' for this case.
         if collision in (UPDATE,UPDATEALWAYS) and fileform != 'epub':
             raise NotGoingToDownload("Cannot update non-epub format.")
         
@@ -470,7 +333,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         
         if book['calibre_id'] != None:
             # updating an existing book.  Update mode applies.
-            print("update existing id:%s"%book['calibre_id'])
+            print("update id:%s"%book['calibre_id'])            
             book_id = book['calibre_id']
             # No handling needed: OVERWRITEALWAYS,CALIBREONLY
             
@@ -484,12 +347,12 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
                                  (story.getMetadata("author", removeallentities=True),)) # author is a list.
             identicalbooks = db.find_identical_books(mi)
             ## removed for being overkill.
-            # for ib in identicalbooks:
+            # for ib in db.find_identical_books(mi):
             #     # only *really* identical if URL matches, too.
             #     # XXX make an option?
             #     if self._get_story_url(db,ib) == url:
             #         identicalbooks.append(ib)
-            #print("identicalbooks:%s"%identicalbooks)
+            print("identicalbooks:%s"%identicalbooks)
 
             if collision == SKIP and identicalbooks:
                 raise NotGoingToDownload("Skipping duplicate story.","list_remove.png")
@@ -513,7 +376,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
             
             ## newer/chaptercount checks are the same for both:
             # Update epub, but only if more chapters.
-            if collision in (UPDATE,UPDATEALWAYS): # collision == UPDATE
+            if collision == UPDATE:
                 # 'book' can exist without epub.  If there's no existing epub,
                 # let it go and it will download it.
                 if db.has_format(book_id,fileform,index_is_id=True):
@@ -524,15 +387,12 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
                                                      titlenavpoints=False,
                                                      striptitletoc=True,
                                                      forceunique=False)
+    
                     urlchaptercount = int(story.getMetadata('numChapters'))
-                    if chaptercount == urlchaptercount:
-                        if collision == UPDATE:
-                            raise NotGoingToDownload("Already contains %d chapters."%chaptercount,'edit-undo.png')
-                        else:
-                            # UPDATEALWAYS
-                            skip_date_update = True
+                    if chaptercount == urlchaptercount: # and not onlyoverwriteifnewer:
+                        raise NotGoingToDownload("Already contains %d chapters."%chaptercount,'edit-undo.png')
                     elif chaptercount > urlchaptercount:
-                        raise NotGoingToDownload("Existing epub contains %d chapters, web site only has %d. Use Overwrite to force update." % (chaptercount,urlchaptercount),'dialog_error.png')
+                        raise NotGoingToDownload("Existing epub contains %d chapters, web site only has %d." % (chaptercount,urlchaptercount),'dialog_error.png')
     
             if collision == OVERWRITE and \
                     db.has_format(book_id,formmapping[fileform],index_is_id=True):
@@ -553,18 +413,11 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
                 print("existing epub tmp:"+tmp.name)
                 book['epub_for_update'] = tmp.name
 
-        if collision != CALIBREONLY and not skip_date_update:
-            # I'm half convinced this should be dateUpdated instead, but
-            # this behavior matches how epubs come out when imported
-            # dateCreated == packaged--epub/etc created.
-            book['timestamp'] = story.getMetadataRaw('dateCreated').replace(tzinfo=local_tz)
-        
         if book['good']: # there shouldn't be any !'good' books at this point.
             # if still 'good', make a temp file to write the output to.
             tmp = PersistentTemporaryFile(prefix='new-%s-'%book['calibre_id'],
                                                suffix='.'+options['fileform'],
                                                dir=options['tdir'])
-            print("title:"+book['title'])
             print("outfile:"+tmp.name)
             book['outfile'] = tmp.name            
                 
@@ -575,7 +428,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
                                      'collision':ADDNEW,
                                      'updatemeta':True}):
         '''
-        Called by LoopProgressDialog to start story downloads BG processing.
+        Called by MetadataProgressDialog to start story downloads BG processing.
         adapter_list is a list of tuples of (url,adapter)
         '''
         #print("start_download_list:book_list:%s"%book_list)
@@ -618,311 +471,163 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         
         self.gui.status_bar.show_message('Starting %d FanFictionDownLoads'%len(book_list),3000)
 
-    def _update_book(self,book,db=None,
-                     options={'fileform':'epub',
-                              'collision':ADDNEW,
-                              'updatemeta':True}):
-        print("add/update %s %s"%(book['title'],book['url']))
-        mi = self._make_mi_from_book(book)
-                
-        if options['collision'] != CALIBREONLY:
-            self._add_or_update_book(book,options,prefs,mi)
-
-        if options['collision'] == CALIBREONLY or \
-                (options['updatemeta'] and book['good']):
-            self._update_metadata(db, book['calibre_id'], book, mi)        
-
-    def _update_books_completed(self, book_list, options={}):
-        
-        add_list = filter(lambda x : x['good'] and x['added'], book_list)
-        update_list = filter(lambda x : x['good'] and not x['added'], book_list)
-        update_ids = [ x['calibre_id'] for x in update_list ]
-        
-        if len(add_list):
-            ## even shows up added to searchs.  Nice.
-            self.gui.library_view.model().books_added(len(add_list))
-
-        if update_ids:
-            self.gui.library_view.model().refresh_ids(update_ids)
-
-        current = self.gui.library_view.currentIndex()
-        self.gui.library_view.model().current_changed(current, self.previous)
-        self.gui.tags_view.recount()
-        
-        self.gui.status_bar.show_message(_('Finished Adding/Updating %d books.'%(len(update_list) + len(add_list))), 3000)
-            
-        if len(update_list) + len(add_list) != len(book_list):
-            d = DisplayStoryListDialog(self.gui,
-                                       'Updates completed, final status',
-                                       prefs,
-                                       self.qaction.icon(),
-                                       book_list,
-                                       label_text='Stories have be added or updated in Calibre, some had additional problems.'
-                                       )
-            d.exec_()
-    
-        print("all done, remove temp dir.")
-        remove_dir(options['tdir'])
-        
     def download_list_completed(self, job, options={}):
         if job.failed:
             self.gui.job_exception(job, dialog_title='Failed to Download Stories')
             return
+        #print("download_list_completed job:%s"%job.result)
+        # for b in job.result:
+        #     print("job.result: %s"%b['title'])
 
-        self.previous = self.gui.library_view.currentIndex()
         db = self.gui.current_db
 
-        if display_story_list(self.gui,
-                              'Downloads finished, confirm to update Calibre',
-                              prefs,
-                              self.qaction.icon(),
-                              job.result,
-                              label_text='Stories will not be added or updated in Calibre without confirmation.',
-                              offer_skip=True):
+        d = DisplayStoryListDialog(self.gui,
+                                   'Downloads finished, confirm to update Calibre',
+                                   prefs,
+                                   self.qaction.icon(),
+                                   job.result,
+                                   label_text='Stories will not be added or updated in Calibre without confirmation.'
+                                   )
+        d.exec_()
+        if d.result() == d.Accepted:
             
-            book_list = job.result
-            good_list = filter(lambda x : x['good'], book_list)
-            total_good = len(good_list)
+            ## in case the user removed any from the list.
+            book_list = d.get_books()
+            # for b in book_list:
+            #     print("d list: %s"%b['title'])
 
-            self.gui.status_bar.show_message(_('Adding/Updating %s books.'%total_good))
+            update_list = filter(lambda x : x['good'] and x['calibre_id'] != None,
+                                 book_list)
 
-            if total_good > 0:
-                LoopProgressDialog(self.gui,
-                                   good_list,
-                                   partial(self._update_book, options=options, db=self.gui.current_db),
-                                   partial(self._update_books_completed, options=options),
-                                   init_label="Updating calibre for stories...",
-                                   win_title="Update calibre for stories",
-                                   status_prefix="Updated")
+            add_list = filter(lambda x : x['good'] and x['calibre_id'] == None,
+                              book_list)
 
-    def _add_or_update_book(self,book,options,prefs,mi=None):
-        db = self.gui.current_db
-        
-        if mi == None:
-            mi = self._make_mi_from_book(book)
+            total_good = len(update_list)+len(add_list)
 
-        book_id = book['calibre_id']
-        if book_id == None:
-            book_id = db.create_book_entry(mi,
-                                           add_duplicates=True)
-            book['calibre_id'] = book_id
-            book['added'] = True
-        else:
-            book['added'] = False
+            self.gui.status_bar.show_message(_('Adding/Updating %s books.'%total_good), 3000)
+            
+            #print("==================================================")
+            addfiles,addfileforms,addmis=[],[],[]
+            
+            added=0
+            for book in add_list:
+                print("adding %s %s"%(book['title'],book['url']))
+                addfiles.append(book['outfile'])
+                addfileforms.append(options['fileform'])
+                addmis.append(self._make_mi_from_book(book))
+                    
+            (notadded,added)=db.add_books(addfiles,addfileforms,addmis,
+                                               add_duplicates=True)
 
-        if not db.add_format_with_hooks(book_id,
-                                        options['fileform'],
-                                        book['outfile'], index_is_id=True):
-            book['comment'] = "Adding format to book failed for some reason..."
-            book['good']=False
-            book['icon']='dialog_error.png'
+            #print("==================================================")
+            updated=0
+            updated_ids = set()
+            for book in update_list:
+                print("updating (%s)%s %s"%(book['calibre_id'],book['title'],book['url']))
 
-        if prefs['deleteotherforms']:
-            fmts = db.formats(book['calibre_id'], index_is_id=True).split(',')
-            for fmt in fmts:
-                if fmt != formmapping[options['fileform']]:
-                    print("remove f:"+fmt)
-                    db.remove_format(book['calibre_id'], fmt, index_is_id=True)#, notify=False
-
-        if prefs['addtolists'] or prefs['addtoreadlists']:
-            self._update_reading_lists([book_id],add=True)
-                
-        return book_id
-
-    def _update_metadata(self, db, book_id, book, mi):
-        if prefs['keeptags']:
-            old_tags = db.get_tags(book_id)
-            # remove old Completed/In-Progress only if there's a new one.
-            if 'Completed' in mi.tags or 'In-Progress' in mi.tags:
-                old_tags = filter( lambda x : x not in ('Completed', 'In-Progress'), old_tags)
-                # remove old Last Update tags if there are new ones.
-            if len(filter( lambda x : not x.startswith("Last Update"), mi.tags)) > 0:
-                old_tags = filter( lambda x : not x.startswith("Last Update"), old_tags)
-            # mi.tags needs to be list, but set kills dups.
-            mi.tags = list(set(list(old_tags)+mi.tags))
-
-        if 'langcode' in book['all_metadata']:
-            mi.languages=[book['all_metadata']['langcode']]
-        else:
-            # Set language english, but only if not already set.
-            oldmi = db.get_metadata(book_id,index_is_id=True)
-            if not oldmi.languages:
-                mi.languages=['eng']
-                
-        db.set_metadata(book_id,mi)
-
-        # do configured column updates here.
-        #print("all_metadata: %s"%book['all_metadata'])
-        custom_columns = self.gui.library_view.model().custom_columns
-
-        #print("prefs['custom_cols'] %s"%prefs['custom_cols'])
-        for col, meta in prefs['custom_cols'].iteritems():
-            #print("setting %s to %s"%(col,meta))
-            if col not in custom_columns:
-                print("%s not an existing column, skipping."%col)
-                continue
-            coldef = custom_columns[col]
-            if not meta.startswith('status-') and meta not in book['all_metadata']:
-                print("No value for %s, skipping."%meta)
-                continue
-            if meta not in permitted_values[coldef['datatype']]:
-                print("%s not a valid column type for %s, skipping."%(col,meta))
-                continue
-            label = coldef['label']
-            if coldef['datatype'] in ('enumeration','text','comments','datetime','series'):
-                db.set_custom(book_id, book['all_metadata'][meta], label=label, commit=False)
-            elif coldef['datatype'] in ('int','float'):
-                num = unicode(book['all_metadata'][meta]).replace(",","")
-                db.set_custom(book_id, num, label=label, commit=False)
-            elif coldef['datatype'] == 'bool' and meta.startswith('status-'):
-                if meta == 'status-C':
-                    val = book['all_metadata']['status'] == 'Completed'
-                if meta == 'status-I':
-                    val = book['all_metadata']['status'] == 'In-Progress'
-                db.set_custom(book_id, val, label=label, commit=False)
-                
-        db.commit()
-
-    def _get_clean_reading_lists(self,lists):
-        if lists == None or lists.strip() == "" :
-            return []
-        else:
-            return filter( lambda x : x, map( lambda x : x.strip(), lists.split(',') ) )
-        
-    def _update_reading_lists(self,book_ids,add=True):
-        try:
-            rl_plugin = self.gui.iactions['Reading List']
-        except:
-            if prefs['addtolists'] or prefs['addtoreadlists']:
-                message="<p>You configured FanFictionDownLoader to automatically update Reading Lists, but you don't have the Reading List plugin installed anymore?</p>"
-                confirm(message,'fanfictiondownloader_no_reading_list_plugin', self.gui)
-            return
-        
-        # XXX check for existence of lists, warning if not.
-        if prefs['addtoreadlists']:
-            if add:
-                addremovefunc = rl_plugin.add_books_to_list
-            else:
-                addremovefunc = rl_plugin.remove_books_from_list
-                
-            lists = self._get_clean_reading_lists(prefs['read_lists'])
-            if len(lists) < 1 :
-                message="<p>You configured FanFictionDownLoader to automatically update \"To Read\" Reading Lists, but you don't have any lists set?</p>"
-                confirm(message,'fanfictiondownloader_no_read_lists', self.gui)
-            for l in lists:
-                if l in rl_plugin.get_list_names():
-                    #print("add good read l:(%s)"%l)
-                    addremovefunc(l,
-                                  book_ids,
-                                  display_warnings=False)
+                if options['collision'] == CALIBREONLY:
+                    updated += 1
                 else:
-                    if l != '':
-                        message="<p>You configured FanFictionDownLoader to automatically update Reading List '%s', but you don't have a list of that name?</p>"%l
-                        confirm(message,'fanfictiondownloader_no_reading_list_%s'%l, self.gui)
-                        
-        if prefs['addtolists'] and (add or (prefs['addtolistsonread'] and prefs['addtoreadlists']) ):
-            lists = self._get_clean_reading_lists(prefs['send_lists'])
-            if len(lists) < 1 :
-                message="<p>You configured FanFictionDownLoader to automatically update \"Send to Device\" Reading Lists, but you don't have any lists set?</p>"
-                confirm(message,'fanfictiondownloader_no_send_lists', self.gui)
-            for l in lists:
-                if l in rl_plugin.get_list_names():
-                    #print("good send l:(%s)"%l)
-                    rl_plugin.add_books_to_list(l,
-                                                book_ids,
-                                                display_warnings=False)
-                else:
-                    if l != '':
-                        message="<p>You configured FanFictionDownLoader to automatically update Reading List '%s', but you don't have a list of that name?</p>"%l
-                        confirm(message,'fanfictiondownloader_no_reading_list_%s'%l, self.gui)
+                    if not db.add_format_with_hooks(book['calibre_id'], options['fileform'], book['outfile'], index_is_id=True):
+                        book['comment'] = "Adding format to book failed for some reason..."
+                        book['good']=False
+                        book['icon']='dialog_error.png'
+                    else:
+                        updated += 1
+                        updated_ids.add(book['calibre_id'])
+                        # get all formats.
+                        if prefs['deleteotherforms']:
+                            fmts = set([x.lower() for x in db.formats(book['calibre_id'], index_is_id=True).split(',')])
+                            for fmt in fmts:
+                                if fmt != options['fileform']:
+                                    print("remove f:"+fmt)
+                                    db.remove_format(book['calibre_id'], fmt, index_is_id=True)#, notify=False
 
-    def _find_existing_book_id(self,db,book,matchurl=True):
-        mi = MetaInformation(book["title"],(book["author"],)) # author is a list.
-        identicalbooks = db.find_identical_books(mi)
-        if matchurl: # only *really* identical if URL matches, too.
-            for ib in identicalbooks:
-                if self._get_story_url(db,ib) == book['url']:
-                    return ib
-        if identicalbooks:
-            return identicalbooks.pop()
-        return None
+                if options['collision'] == CALIBREONLY or \
+                        (options['updatemeta'] or book['good']) :
+                    updated_ids.add(book['calibre_id'])
+                    db.set_metadata(book['calibre_id'],
+                                    self._make_mi_from_book(book))
+                    
+            if added:
+                ## even shows up added to searchs.  Nice.
+                self.gui.library_view.model().books_added(added)
+
+            # the refresh causes problems sometimes?  Switching libraries
+            # and back cleared it?--No problems with BG proc, but clears selected and search?
+            if updated_ids:
+                self.gui.library_view.model().refresh_ids(updated_ids)
+
+            self.gui.status_bar.show_message(_('Finished Adding/Updating %d books.'%(updated + added)), 3000)
+            
+            if updated + added != total_good:
+                d = DisplayStoryListDialog(self.gui,
+                                           'Updates completed, final status',
+                                           prefs,
+                                           self.qaction.icon(),
+                                           book_list,
+                                           label_text='Stories have be added or updated in Calibre, some had additional problems.'
+                                           )
+                d.exec_()
     
+        print("all done, remove temp dir.")
+        remove_dir(options['tdir'])
+
+
     def _make_mi_from_book(self,book):
         mi = MetaInformation(book['title'],(book['author'],)) # author is a list.
         mi.set_identifiers({'url':book['url']})
         mi.publisher = book['publisher']
         mi.tags = book['tags']
-        #mi.languages = ['en'] # handled in _update_metadata so it can check for existing lang.
+        #mi.languages = ['en']
         mi.pubdate = book['pubdate']
         mi.timestamp = book['timestamp']
         mi.comments = book['comments']
-        mi.series = book['series']
         return mi
 
 
     def _convert_urls_to_books(self, urls):
         books = []
-        uniqueurls = set()
         for url in urls:
-            book = self._convert_url_to_book(url)
-            if book['url'] in uniqueurls:
-                book['good'] = False
-                book['comment'] = "Same story already included."
-            uniqueurls.add(book['url'])
+            book = {}
+            book['good'] = True
+            book['calibre_id'] = None
+            book['title'] = 'Unknown'
+            book['author'] = 'Unknown'
+            book['author_sort'] = 'Unknown'
+                
+            book['comment'] = ''
+            book['url'] = ''
+            
+            self._set_book_url_and_comment(book,url)
+                    
             books.append(book)
         return books
-
-    def _convert_url_to_book(self, url):
-        book = {}
-        book['good'] = True
-        book['calibre_id'] = None
-        book['title'] = 'Unknown'
-        book['author'] = 'Unknown'
-        book['author_sort'] = 'Unknown'
-            
-        book['comment'] = ''
-        book['url'] = ''
-        book['added'] = False
-        
-        self._set_book_url_and_comment(book,url)
-        return book
-        
-    def _convert_id_to_book(self, idval, good=True):
-        book = {}
-        book['good'] = good
-        book['calibre_id'] = idval
-        book['title'] = 'Unknown'
-        book['author'] = 'Unknown'
-        book['author_sort'] = 'Unknown'
-            
-        book['comment'] = ''
-        book['url'] = ''
-        book['added'] = False
-        
-        return book
-        
     
-    # def _convert_calibre_ids_to_books(self, db, ids):
-    #     books = []
-    #     for book_id in ids:
-    #         books.append(self._convert_calibre_id_to_book(db,book_id))
-    #     return books
+    def _convert_calibre_ids_to_books(self, db, ids):
+        books = []
+        for book_id in ids:
+            mi = db.get_metadata(book_id, index_is_id=True)
+            book = {}
+            book['good'] = True
+            book['calibre_id'] = mi.id
+            book['title'] = mi.title
+            book['author'] = authors_to_string(mi.authors)
+            book['author_sort'] = mi.author_sort
+            # book['series'] = mi.series
+            # if mi.series:
+            #     book['series_index'] = mi.series_index
+            # else:
+            #     book['series_index'] = 0
+                
+            book['comment'] = ''
+            book['url'] = ""
             
-    def _populate_book_from_calibre_id(self, book, db=None):
-        mi = db.get_metadata(book['calibre_id'], index_is_id=True)
-        #book = {}
-        book['good'] = True
-        book['calibre_id'] = mi.id
-        book['title'] = mi.title
-        book['author'] = authors_to_string(mi.authors)
-        book['author_sort'] = mi.author_sort
-        book['comment'] = ''
-        book['url'] = ""
-        book['added'] = False
-        
-        url = self._get_story_url(db,book['calibre_id'])
-        self._set_book_url_and_comment(book,url)
-        #return book
+            url = self._get_story_url(db,book_id)
+            self._set_book_url_and_comment(book,url)
+                    
+            books.append(book)
+        return books
 
     def _set_book_url_and_comment(self,book,url):
         if not url:
@@ -949,12 +654,11 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
             if db.has_format(book_id,'EPUB',index_is_id=True):
                 existingepub = db.format(book_id,'EPUB',index_is_id=True, as_file=True)
                 mi = get_metadata(existingepub,'EPUB')
+                #print("mi:%s"%mi)
                 identifiers = mi.get_identifiers()
                 if 'url' in identifiers:
                     #print("url from epub:"+identifiers['url'].replace('|',':'))
                     return identifiers['url'].replace('|',':')
-                # look for dc:source
-                return get_dcsource(existingepub)
         return None
 
     def _is_good_downloader_url(self,url):
@@ -973,6 +677,40 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         except:
             return None;
 
+
+
+def get_job_details(job):
+    '''
+    Convert the job result into a set of parameters including a detail message
+    summarising the success of the extraction operation.
+    This is used by both the threaded and worker approaches to extraction
+    '''
+    extracted_ids, same_isbn_ids, failed_ids, no_format_ids = job.result
+    if not hasattr(job, 'html_details'):
+        job.html_details = job.details
+    det_msg = []
+    for i, title in failed_ids:
+        if i in no_format_ids:
+            msg = title + ' (No formats)'
+        else:
+            msg = title + ' (ISBN not found)'
+        det_msg.append(msg)
+    if same_isbn_ids:
+        if det_msg:
+            det_msg.append('----------------------------------')
+        for i, title in same_isbn_ids:
+            msg = title + ' (Same ISBN)'
+            det_msg.append(msg)
+    if len(extracted_ids) > 0:
+        if det_msg:
+            det_msg.append('----------------------------------')
+        for i, title, last_modified, isbn in extracted_ids:
+            msg = '%s (Extracted %s)'%(title, isbn)
+            det_msg.append(msg)
+
+    det_msg = '\n'.join(det_msg)
+    return extracted_ids, same_isbn_ids, failed_ids, det_msg
+
 def get_url_list(urls):
     def f(x):
         if x.strip(): return True

calibre-plugin/jobs.py

@@ -16,6 +16,7 @@ from StringIO import StringIO
 #from threading import Event
 
 #from calibre.gui2.convert.single import sort_formats_by_preference
+from calibre.utils.config import prefs
 from calibre.utils.ipc.server import Server
 from calibre.utils.ipc.job import ParallelJob
 from calibre.utils.logging import Log
@@ -41,13 +42,11 @@ def do_download_worker(book_list, options,
     '''
     server = Server(pool_size=cpus)
 
-    print(options['version'])
     total = 0
     # Queue all the jobs
-    print("Adding jobs for URLs:")
     for book in book_list:
         if book['good']:
-            print("%s"%book['url'])
+            print("add job for %s"%book['url'])
             total += 1
             args = ['calibre_plugins.fanfictiondownloader_plugin.jobs',
                     'do_download_for_worker',
@@ -86,7 +85,7 @@ def do_download_worker(book_list, options,
         count = count + 1
         notification(float(count)/total, 'Downloaded Story')
         # Add this job's output to the current log
-        print('Logfile for book ID %s (%s)'%(book_id, job._book['title']))
+        print('Logfile for book ID %s (%s)'%(book_id, book['title']))
         print(job.details)
 
         if count >= total:
@@ -104,10 +103,15 @@ def do_download_for_worker(book,options):
     when run as a worker job
     '''
     try:
+        print("do_download_for_worker")
+        # print("is_adult:%s"%book['is_adult'])
+        # print("personal.ini len:%s"%len(options['personal.ini']))
+        # print("defaults.ini len:%s"%len(get_resources("defaults.ini")))
+        #time.sleep(2.0)
         book['comment'] = 'Download started...'
 
         ffdlconfig = SafeConfigParser()
-        ffdlconfig.readfp(StringIO(get_resources("plugin-defaults.ini")))
+        ffdlconfig.readfp(StringIO(get_resources("defaults.ini")))
         ffdlconfig.readfp(StringIO(options['personal.ini']))
         
         adapter = adapters.getAdapter(ffdlconfig,book['url'])
@@ -129,7 +133,7 @@ def do_download_for_worker(book,options):
         elif options['collision'] in (ADDNEW, SKIP, OVERWRITE, OVERWRITEALWAYS) or \
                 ('epub_for_update' not in book and options['collision'] in (UPDATE, UPDATEALWAYS)):
             print("write to %s"%outfile)
-            writer.writeStory(outfilename=outfile, forceOverwrite=True)
+            writer.writeStory(outfilename=outfile)
             book['comment'] = 'Download %s completed, %s chapters.'%(options['fileform'],story.getMetadata("numChapters"))
             
         ## checks were done earlier, just update it.
@@ -144,7 +148,6 @@ def do_download_for_worker(book,options):
                                              striptitletoc=True,
                                              forceunique=False)
             print("Do update - epub(%d) vs url(%d)" % (chaptercount, urlchaptercount))
-            print("write to %s"%outfile)
 
             ## Get updated title page/metadata by itself in an epub.
             ## Even if the title page isn't included, this carries the metadata.
@@ -181,7 +184,8 @@ def do_download_for_worker(book,options):
         book['good']=False
         book['comment']=unicode(e)
         book['icon']='dialog_error.png'
-        print("Exception: %s:%s"%(book,unicode(e)))
+        print("%s:%s"%(book,unicode(e)))
+        # XXX trace for not-expected exceptions
         traceback.print_exc()
 
     #time.sleep(10)

defaults.ini

@@ -1,4 +1,4 @@
-# Copyright 2012 Fanficdownloader team
+# Copyright 2011 Fanficdownloader team
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,9 +36,7 @@ formatext_label:File Extension
 ## Sometimes there are multiple categories and/or genres.
 category_label:Category
 genre_label:Genre
-language_label:Language
 characters_label:Characters
-series_label:Series
 ## Completed/In-Progress
 status_label:Status
 ## Dates story first published, last updated, and downloaded(last with time).
@@ -63,19 +61,12 @@ authorId_label:Author ID
 extratags_label:Extra Tags
 ## The version of fanficdownloader
 ##
-version_label:FFDL Version
+version_label:FFD Version
 
 ## items to include in the title page
 ## Empty entries will *not* appear, even if in the list.
 ## 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
-
-## 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.
-collect_series: true
+titlepage_entries: category,genre,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,description
 
 ## include title page as first page.
 include_titlepage: true
@@ -129,55 +120,21 @@ extratags: FanFiction
 ## Primarily for commandline.
 #slow_down_sleep_time:0.5
 
+## output background color--only used by html and epub (and ignored in
+## epub by many readers).  Must be hex code, # will be added.
+background_color: ffffff
+
 ## For use only with stand-alone CLI version--run a command on the
 ## generated file after it's produced.  All of the titlepage_entries
 ## values are available, plus output_filename.
 #post_process_cmd: addbook -f "${output_filename}" -t "${title}"
 
-## Use regular expressions to find and replace (or remove) metadata.
-## For example, you could change Sci-Fi=>SF, remove *-Centered tags,
-## etc.  See http://docs.python.org/library/re.html (look for re.sub)
-## for regexp details.
-## Make sure to keep at least one space at the start of each line and
-## to escape % to %%, if used.
-#replace_metadata:
-# Sci-Fi=>SF
-# Puella Magi Madoka Magica.* => Madoka
-# Comedy=>Humor
-# Crossover: (.*)=>\1
-# (.*)Great(.*)=>\1Moderate\2
-# .*-Centered=>
-
 ## Each output format has a section that overrides [defaults]
 [html]
 
-## output background color--only used by html and epub (and ignored in
-## epub by many readers).  Included below in output_css--will be
-## ignored if not in output_css.
-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.
-output_css:
- body { background-color: #%(background_color)s; }
- .CI {
-     text-align:center;
-     margin-top:0px;
-     margin-bottom:0px;
-     padding:0px;
-     }
- .center   {text-align: center;}
- .cover    {text-align: center;}
- .full     {width: 100%%; }
- .quarter  {width: 25%%; }
- .smcap    {font-variant: small-caps;}
- .u        {text-decoration: underline;}
- .bold     {font-weight: bold;}
-
 [txt]
 ## Add URLs since there aren't links.
-titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,storyUrl, authorUrl, description
+titlepage_entries: category,genre,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,storyUrl, authorUrl, description
 
 ## use \r\n for line endings, the windows convention.  text output only.
 windows_eol: true
@@ -197,44 +154,11 @@ titlepage_use_table: false
 ## When using tables, make these span both columns.
 wide_titlepage_entries: description, storyUrl, author URL
 
-## output background color--only used by html and epub (and ignored in
-## epub by many readers).  Included below in output_css--will be
-## ignored if not in output_css.
-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.
-output_css: 
- body { background-color: #%(background_color)s;
-        text-align: justify;
-        margin: 2%%; }
- pre { font-size: x-small; }
- sml { font-size: small; }
- h1 { text-align: center; }
- h2 { text-align: center; }
- h3 { text-align: center; }
- h4 { text-align: center; }
- h5 { text-align: center; }
- h6 { text-align: center; }
- .CI {
-     text-align:center;
-     margin-top:0px;
-     margin-bottom:0px;
-     padding:0px;
-     }
- .center   {text-align: center;}
- .cover    {text-align: center;}
- .full     {width: 100%%; }
- .quarter  {width: 25%%; }
- .smcap    {font-variant: small-caps;}
- .u        {text-decoration: underline;}
- .bold     {font-weight: bold;}
-
 [mobi]
 ## mobi TOC cannot be turned off right now.
 #include_tocpage: true
 
+
 ## Each site has a section that overrides [defaults] *and* the format
 ## sections test1.com specifically is not a real story site.  Instead,
 ## it is a fake site for testing configuration and output.  It uses
@@ -273,9 +197,6 @@ extratags:
 #username:YourName
 #password:yourpassword
 
-## twilighted.net (ab)uses series as personal reading lists.
-collect_series: false
-
 [www.twiwrite.net]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -284,9 +205,6 @@ collect_series: false
 #username:YourName
 #password:yourpassword
 
-## twiwrite.net (ab)uses series as personal reading lists.
-collect_series: false
-
 [www.whofic.com]
 
 [www.mediaminer.org]
@@ -304,9 +222,6 @@ collect_series: false
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-## thewriterscoffeeshop.com (ab)uses series as personal reading lists.
-collect_series: false
-
 [www.ficwad.com]
 ## Some sites require login (or login for some rated stories) The
 ## program can prompt you, or you can save it in config.  In
@@ -347,12 +262,6 @@ output_filename: ${title}-${siteabbrev}_${authorId}_${storyId}${formatext}
 ## confirm they are adult for adult content.  In commandline version,
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
-## tth is a little unusual--it doesn't require user/pass, but the site
-## keeps track of which chapters you've read and won't send another
-## update until it thinks you're up to date.  This way, on download,
-## it thinks you're up to date.
-#username:YourName
-#password:yourpassword
 
 [overrides]
 ## It may sometimes be useful to override all of the specific format,

downloader.py

@@ -46,6 +46,7 @@ def writeStory(config,adapter,writeformat,metaonly=False,outstream=None):
     return output_filename
 
 def main():
+
    # read in args, anything starting with -- will be treated as --<varible>=<value>
    usage = "usage: %prog [options] storyurl"
    parser = OptionParser(usage)
@@ -83,17 +84,14 @@ def main():
 
    conflist = []
    homepath = join(expanduser("~"),".fanficdownloader")
-   
    if isfile(join(homepath,"defaults.ini")):
        conflist.append(join(homepath,"defaults.ini"))
-   if isfile("defaults.ini"):
-       conflist.append("defaults.ini")
-       
    if isfile(join(homepath,"personal.ini")):
        conflist.append(join(homepath,"personal.ini"))
+   if isfile("defaults.ini"):
+       conflist.append("defaults.ini")
    if isfile("personal.ini"):
        conflist.append("personal.ini")
-       
    if options.configfile:
        conflist.extend(options.configfile)
       
@@ -129,22 +127,21 @@ def main():
            url = args[0]
 
        adapter = adapters.getAdapter(config,url)
-
-       ## three tries, that's enough if both user/pass & is_adult needed,
-       ## or a couple tries of one or the other
-       for x in range(0,2):
-           try:
-               adapter.getStoryMetadataOnly()
-           except exceptions.FailedToLogin:
-               print "Login Failed, Need Username/Password."
-               sys.stdout.write("Username: ")
-               adapter.username = sys.stdin.readline().strip()
-               adapter.password = getpass.getpass(prompt='Password: ')
-               #print("Login: `%s`, Password: `%s`" % (adapter.username, adapter.password))
-           except exceptions.AdultCheckRequired:
-               print "Please confirm you are an adult in your locale: (y/n)?"
-               if sys.stdin.readline().strip().lower().startswith('y'):
-                   adapter.is_adult=True
+           
+       try:
+           adapter.getStoryMetadataOnly()
+       except exceptions.FailedToLogin:
+           print "Login Failed, Need Username/Password."
+           sys.stdout.write("Username: ")
+           adapter.username = sys.stdin.readline().strip()
+           adapter.password = getpass.getpass(prompt='Password: ')
+           #print("Login: `%s`, Password: `%s`" % (adapter.username, adapter.password))
+           adapter.getStoryMetadataOnly()
+       except exceptions.AdultCheckRequired:
+           print "Please confirm you are an adult in your locale: (y/n)?"
+           if sys.stdin.readline().strip().lower().startswith('y'):
+               adapter.is_adult=True
+           adapter.getStoryMetadataOnly()
 
        if options.update and not options.force:
            urlchaptercount = int(adapter.getStoryMetadataOnly().getMetadata('numChapters'))
@@ -214,7 +211,4 @@ def main():
        print us
    
 if __name__ == "__main__":
-    #import time
-    #start = time.time()
     main()
-    #print("Total time seconds:%f"%(time.time()-start))

editconfig.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <link href="/css/index.css" rel="stylesheet" type="text/css">
-    <title>FanFictionDownLoader - read fanfiction from twilighted.net, fanfiction.net, fictionpress.com, fictionalley.org, ficwad.com, potionsandsnitches.net, harrypotterfanfiction.com, mediaminer.org on Kindle, Nook, Sony Reader, iPad, iPhone, Android, Aldiko, Stanza</title>
+    <title>Fanfiction Downloader - read fanfiction from twilighted.net, fanfiction.net, fictionpress.com, fictionalley.org, ficwad.com, potionsandsnitches.net, harrypotterfanfiction.com, mediaminer.org on Kindle, Nook, Sony Reader, iPad, iPhone, Android, Aldiko, Stanza</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="google-site-verification" content="kCFc-G4bka_pJN6Rv8CapPBcwmq0hbAUZPkKWqRsAYU" />
     <script type="text/javascript">
@@ -22,7 +22,7 @@
   <body>
     <div id='main' style="width: 80%; margin-left: 10%;">
       <h1>
-	<a href="/" style="text-decoration: none; color: black;">FanFictionDownLoader</a>
+	<a href="/" style="text-decoration: none; color: black;">FanFiction Downloader</a>
       </h1>
 
       <div style="text-align: center">
@@ -67,7 +67,7 @@
 	<img src="http://code.google.com/appengine/images/appengine-silver-120x30.gif"
 	     alt="Powered by Google App Engine" />
 	<br/><br/>
-	This is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">FanFictionDownLoader</a><br/>
+	FanfictionLoader is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">fanficdownloader</a><br/>
 	Copyright &copy; Fanficdownloader team
       </div>
 

epubmerge.py

@@ -224,21 +224,10 @@ def doMerge(outputio,files,authoropts=[],titleopt=None,descopt=None,
                             pass # Skip missing files.
                 
         for itemref in metadom.getElementsByTagName("itemref"):
-
             if not striptitletoc or not re.match(r'(title|toc)_page', itemref.getAttribute("idref")):
                 itemrefs.append(bookid+itemref.getAttribute("idref"))
 
         booknum=booknum+1;
-        if not forceunique:
-            # If not forceunique, it's an epub update.
-            # If there's a "calibre_bookmarks.txt", it's from reading
-            # in Calibre and should be preserved.
-            try:
-                fn = "META-INF/calibre_bookmarks.txt"
-                outputepub.writestr(fn,epub.read(fn))
-            except:
-                pass
-        
 
     ## create content.opf file. 
     uniqueid="epubmerge-uid-%d" % time() # real sophisticated uid scheme.
@@ -366,7 +355,7 @@ def doMerge(outputio,files,authoropts=[],titleopt=None,descopt=None,
     ## during TOC generation to save loops.
     outputepub.writestr("content.opf",contentdom.toxml('utf-8'))
     outputepub.writestr("toc.ncx",tocncxdom.toxml('utf-8'))
-
+    
     # declares all the files created by Windows.  otherwise, when
     # it runs in appengine, windows unzips the files as 000 perms.
     for zf in outputepub.filelist:

example.ini

@@ -1,12 +1,6 @@
 ## This is an example of what your personal configuration might look
 ## like.
 
-[defaults]
-## Some sites also 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
-
 ## Most common, I expect will be using this to save username/passwords
 ## for different sites.
 [www.twilighted.net]

fanficdownloader/adapters/__init__.py

@@ -1,99 +1,96 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2011 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 os, re, sys, glob, types
-from os.path import dirname, basename, normpath
-import logging
-import urlparse as up
-
-from .. import exceptions as exceptions
-
-## must import each adapter here.
-
-import adapter_test1
-import adapter_fanfictionnet
-import adapter_castlefansorg
-import adapter_fanfictionnet
-import adapter_fictionalleyorg
-import adapter_fictionpresscom
-import adapter_ficwadcom
-import adapter_fimfictionnet
-import adapter_harrypotterfanfictioncom
-import adapter_mediaminerorg
-import adapter_potionsandsnitchesnet
-import adapter_tenhawkpresentscom
-import adapter_adastrafanficcom
-import adapter_thewriterscoffeeshopcom
-import adapter_tthfanficorg
-import adapter_twilightednet
-import adapter_twiwritenet
-import adapter_whoficcom
-import adapter_siyecouk
-import adapter_archiveofourownorg
-import adapter_ficbooknet
-import adapter_gayauthorsorg
-
-## This bit of complexity allows adapters to be added by just adding
-## importing.  It eliminates the long if/else clauses we used to need
-## to pick out the adapter.
-    
-## List of registered site adapters.
-__class_list = []
-
-def imports():
-    for name, val in globals().items():
-        if isinstance(val, types.ModuleType):
-            yield val.__name__
-
-for x in imports():
-    if "fanficdownloader.adapters.adapter_" in x:
-        #print x
-        __class_list.append(sys.modules[x].getClass())
-            
-def getAdapter(config,url):
-    ## fix up leading protocol.
-    fixedurl = re.sub(r"(?i)^[htp]+[:/]+","http://",url.strip())
-    if not fixedurl.startswith("http"):
-        fixedurl = "http://%s"%url
-    ## remove any trailing '#' locations.
-    fixedurl = re.sub(r"#.*$","",fixedurl)
-    
-    ## remove any trailing '&' parameters--?sid=999 will be left.
-    ## that's all that any of the current adapters need or want.
-    fixedurl = re.sub(r"&.*$","",fixedurl)
-    
-    parsedUrl = up.urlparse(fixedurl)
-    domain = parsedUrl.netloc.lower()
-    if( domain != parsedUrl.netloc ):
-        fixedurl = fixedurl.replace(parsedUrl.netloc,domain)
-
-    logging.debug("site:"+domain)
-    cls = getClassFor(domain)
-    if not cls:
-        logging.debug("trying site:www."+domain)
-        cls = getClassFor("www."+domain)
-        fixedurl = fixedurl.replace("http://","http://www.")
-    if cls:
-        adapter = cls(config,fixedurl) # raises InvalidStoryURL
-        return adapter
-    # No adapter found.
-    raise exceptions.UnknownSite( url, [cls.getSiteDomain() for cls in __class_list] )
-
-def getClassFor(domain):
-    for cls in __class_list:
-        if cls.matchesSite(domain):
-            return cls
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 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 os, re, sys, glob, types
+from os.path import dirname, basename, normpath
+import logging
+import urlparse as up
+
+from .. import exceptions as exceptions
+
+## must import each adapter here.
+
+import adapter_test1
+import adapter_fanfictionnet
+import adapter_fanficcastletvnet
+import adapter_fanfictionnet
+import adapter_fictionalleyorg
+import adapter_fictionpresscom
+import adapter_ficwadcom
+import adapter_fimfictionnet
+import adapter_harrypotterfanfictioncom
+import adapter_mediaminerorg
+import adapter_potionsandsnitchesnet
+import adapter_tenhawkpresentscom
+import adapter_adastrafanficcom
+import adapter_thewriterscoffeeshopcom
+import adapter_tthfanficorg
+import adapter_twilightednet
+import adapter_twiwritenet
+import adapter_whoficcom
+import adapter_siyecouk
+
+## This bit of complexity allows adapters to be added by just adding
+## importing.  It eliminates the long if/else clauses we used to need
+## to pick out the adapter.
+    
+## List of registered site adapters.
+__class_list = []
+
+def imports():
+    for name, val in globals().items():
+        if isinstance(val, types.ModuleType):
+            yield val.__name__
+
+for x in imports():
+    if "fanficdownloader.adapters.adapter_" in x:
+        #print x
+        __class_list.append(sys.modules[x].getClass())
+            
+def getAdapter(config,url):
+    ## fix up leading protocol.
+    fixedurl = re.sub(r"(?i)^[htp]+[:/]+","http://",url.strip())
+    if not fixedurl.startswith("http"):
+        fixedurl = "http://%s"%url
+    ## remove any trailing '#' locations.
+    fixedurl = re.sub(r"#.*$","",fixedurl)
+    
+    ## remove any trailing '&' parameters--?sid=999 will be left.
+    ## that's all that any of the current adapters need or want.
+    fixedurl = re.sub(r"&.*$","",fixedurl)
+    
+    parsedUrl = up.urlparse(fixedurl)
+    domain = parsedUrl.netloc.lower()
+    if( domain != parsedUrl.netloc ):
+        fixedurl = fixedurl.replace(parsedUrl.netloc,domain)
+
+    logging.debug("site:"+domain)
+    cls = getClassFor(domain)
+    if not cls:
+        logging.debug("trying site:www."+domain)
+        cls = getClassFor("www."+domain)
+        fixedurl = fixedurl.replace("http://","http://www.")
+    if cls:
+        adapter = cls(config,fixedurl) # raises InvalidStoryURL
+        return adapter
+    # No adapter found.
+    raise exceptions.UnknownSite( url, [cls.getSiteDomain() for cls in __class_list] )
+
+def getClassFor(domain):
+    for cls in __class_list:
+        if cls.matchesSite(domain):
+            return cls

fanficdownloader/adapters/adapter_adastrafanficcom.py

@@ -79,11 +79,6 @@ class AdAstraFanficComSiteAdapter(BaseSiteAdapter):
         if "Content is only suitable for mature adults. May contain explicit language and adult themes. Equivalent of NC-17." in data:
             raise exceptions.AdultCheckRequired(self.url)
             
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        data = data[data.index("<body"):]
-        
         # use BeautifulSoup HTML parser to make everything easier to find.
         soup = bs.BeautifulSoup(data)
 
@@ -147,12 +142,6 @@ class AdAstraFanficComSiteAdapter(BaseSiteAdapter):
                 for cat in catstext:
                     self.story.addToList('category',cat.string)
 
-            if 'Characters' in label:
-                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
-                charstext = [char.string for char in chars]
-                for char in charstext:
-                    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'))
                 genrestext = [genre.string for genre in genres]
@@ -174,45 +163,19 @@ class AdAstraFanficComSiteAdapter(BaseSiteAdapter):
                     self.story.setMetadata('status', 'In-Progress')
 
             if 'Published' in label:
-                self.story.setMetadata('datePublished', makeDate(value.strip(), "%d %b %Y"))
+                self.story.setMetadata('datePublished', makeDate(value.strip(), "%m/%d/%Y"))
             
             if 'Updated' in label:
                 # there's a stray [ at the end.
                 #value = value[0:-1]
-                self.story.setMetadata('dateUpdated', makeDate(value.strip(), "%d %b %Y"))
+                self.story.setMetadata('dateUpdated', makeDate(value.strip(), "%m/%d/%Y"))
 
-        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+'/'+a['href']
-
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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
-            
 
     def getChapterText(self, url):
 
         logging.debug('Getting chapter text from: %s' % url)
 
-        data = self._fetchUrl(url)
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        data = data[data.index("<body"):]
-        
-        soup = bs.BeautifulStoneSoup(data,
+        soup = bs.BeautifulStoneSoup(self._fetchUrl(url),
                                      selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
         
         span = soup.find('div', {'id' : 'story'})

fanficdownloader/adapters/adapter_archiveofourownorg.py

@@ -1,261 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2011 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, utf8FromSoup, makeDate
-
-def getClass():
-    return ArchiveOfOurOwnOrgAdapter
-
-
-class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter):
-
-    def __init__(self, config, url):
-        BaseSiteAdapter.__init__(self, config, url)
-
-        self.decode = ["utf8",
-                       "Windows-1252"] # 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.
-							   
-							   
-        
-        # get storyId from url--url validation guarantees query is only sid=1234
-        self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[2])
-        logging.debug("storyId: (%s)"%self.story.getMetadata('storyId'))
-        
-        # normalized story URL.
-        self._setURL('http://' + self.getSiteDomain() + '/works/'+self.story.getMetadata('storyId'))
-        
-        # Each adapter needs to have a unique site abbreviation.
-        self.story.setMetadata('siteabbrev','ao3')
-
-        # The date format will vary from site to site.
-        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-        self.dateformat = "%Y-%b-%d"
-            
-    @staticmethod # must be @staticmethod, don't remove it.
-    def getSiteDomain():
-        # The site domain.  Does have www here, if it uses it.
-        return 'www.archiveofourown.org'
-
-    def getSiteExampleURLs(self):
-        return "http://"+self.getSiteDomain()+"/works/123456"
-
-    def getSiteURLPattern(self):
-        return re.escape("http://"+self.getSiteDomain()+"/works/")+r"\d+(/chapters/\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"):
-            addurl = "?view_adult=true"
-        else:
-            addurl=""
-
-        meta = self.url+addurl
-        url = self.url+'/navigate'+addurl
-        logging.debug("URL: "+meta)
-
-        try:
-            data = self._fetchUrl(url)
-            meta = self._fetchUrl(meta)
-
-            if "This work could have adult content. If you proceed you have agreed that you are willing to see such content." in meta:
-                raise exceptions.AdultCheckRequired(self.url)
-            
-        except urllib2.HTTPError, e:
-            if e.code == 404:
-                raise exceptions.StoryDoesNotExist(self.meta)
-            else:
-                raise e
-            
-        # use BeautifulSoup HTML parser to make everything easier to find.
-        soup = bs.BeautifulSoup(data)
-        metasoup = bs.BeautifulSoup(meta)
-        # print data
-
-        # Now go hunting for all the meta data and the chapter list.
-        
-        ## Title
-        a = soup.find('a', href=re.compile(r"^/works/\w+"))
-        self.story.setMetadata('title',a.string)
-		
-        # Find authorid and URL from... author url.
-        a = soup.find('a', href=re.compile(r"^/users/\w+/pseuds/\w+"))
-        self.story.setMetadata('authorId',a['href'].split('/')[2])
-        self.story.setMetadata('authorUrl','http://'+self.host+a['href'])
-        self.story.setMetadata('author',a.text)
-
-        # Find the chapters:
-        chapters=soup.findAll('a', href=re.compile(r'/works/'+self.story.getMetadata('storyId')+"/chapters/\d+$"))
-        self.story.setMetadata('numChapters',len(chapters))
-        logging.debug("numChapters: (%s)"%self.story.getMetadata('numChapters'))
-        for x in range(0,len(chapters)):
-            # just in case there's tags, like <i> in chapter titles.
-            chapter=chapters[x]
-            if len(chapters)==1:
-                self.chapterUrls.append((self.story.getMetadata('title'),'http://'+self.host+chapter['href']+addurl))
-            else:
-                self.chapterUrls.append((stripHTML(chapter),'http://'+self.host+chapter['href']+addurl))
-
-
-
-        a = metasoup.find('blockquote',{'class':'userstuff'})
-        if a != None:
-            self.story.setMetadata('description',a.text)
-		
-        a = metasoup.find('dd',{'class':"rating tags"})
-        if a != None:
-            self.story.setMetadata('rating',stripHTML(a.text))
-		
-        a = metasoup.find('dd',{'class':"fandom tags"})
-        fandoms = a.findAll('a',{'class':"tag"})
-        for fandom in fandoms:
-            self.story.addToList('category',fandom.string)
-		
-        a = metasoup.find('dd',{'class':"warning tags"})
-        if a != None:
-            warnings = a.findAll('a',{'class':"tag"})
-            for warning in warnings:
-                if warning.string == "Author Chose Not To Use Archive Warnings":
-                    warning.string = "No Archive Warnings Apply"
-                if warning.string != "No Archive Warnings Apply":
-                    self.story.addToList('warnings',warning.string)
-		
-        a = metasoup.find('dd',{'class':"freeform tags"})
-        if a != None:
-            genres = a.findAll('a',{'class':"tag"})
-            for genre in genres:
-                self.story.addToList('genre',genre.string)
-        a = metasoup.find('dd',{'class':"category tags"})
-        if a != None:
-            genres = a.findAll('a',{'class':"tag"})
-            for genre in genres:
-                if genre != "Gen":
-                    self.story.addToList('genre',genre.string)
-		
-        a = metasoup.find('dd',{'class':"character tags"})
-        if a != None:
-            chars = a.findAll('a',{'class':"tag"})
-            for char in chars:
-                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)
-		
-
-        stats = metasoup.find('dl',{'class':'stats'})
-        dt = stats.findAll('dt')
-        dd = stats.findAll('dd')
-        for x in range(0,len(dt)):
-            label = dt[x].text
-            value = dd[x].text
-
-            if 'Words:' in label:
-                self.story.setMetadata('numWords', value)
-				
-            if 'Chapters:' in label:
-                if value.split('/')[0] == value.split('/')[1]:
-                    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))
-                self.story.setMetadata('dateUpdated', makeDate(stripHTML(value), self.dateformat))
-            
-            if 'Updated' in label:
-                self.story.setMetadata('dateUpdated', makeDate(stripHTML(value), self.dateformat))
-				
-            if 'Completed' in label:
-                self.story.setMetadata('dateUpdated', makeDate(stripHTML(value), self.dateformat))
-
-		
-        try:
-            # Find Series name from series URL.
-            a = metasoup.find('dd',{'class':"series"})
-            b = a.find('a', href=re.compile(r"/series/\d+"))
-            series_name = b.string
-            series_url = 'http://'+self.host+'/fanfic/'+b['href']
-            series_index = int(a.text.split(' ')[1])
-            self.setSeries(series_name, series_index)
-            
-        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)
-		
-        chapter=bs.BeautifulSoup('<div class="story"></div>')
-        soup = bs.BeautifulSoup(self._fetchUrl(url),selfClosingTags=('br','hr'))
-		
-        headnotes = soup.find('div', {'class' : "preface group"}).find('div', {'class' : "notes module"})
-        if headnotes != None:
-            headnotes = headnotes.find('blockquote', {'class' : "userstuff"})
-            if headnotes != None:
-                chapter.append("<b>Author's Note:</b>")
-                chapter.append(headnotes)
-        
-        chapsumm = soup.find('div', {'id' : "summary"})
-        if chapsumm != None:
-            chapsumm = chapsumm.find('blockquote')
-            chapter.append("<b>Summary for the Chapter:</b>")
-            chapter.append(chapsumm)
-        chapnotes = soup.find('div', {'id' : "notes"})
-        if chapnotes != None:
-            chapnotes = chapnotes.find('blockquote')
-            if chapnotes != None:
-                chapter.append("<b>Notes for the Chapter:</b>")
-                chapter.append(chapnotes)
-		
-        text = soup.find('div', {'class' : "userstuff module"})
-        chtext = text.find('h3', {'class' : "landmark heading"})
-        if chtext:
-            chtext.extract()
-        chapter.append(text)
-		
-        chapfoot = soup.find('div', {'class' : "end notes module", 'role' : "complementary"})
-        if chapfoot != None:
-            chapfoot = chapfoot.find('blockquote')
-            chapter.append("<b>Notes for the Chapter:</b>")
-            chapter.append(chapfoot)
-		
-        footnotes = soup.find('div', {'id' : "work_endnotes"})
-        if footnotes != None:
-            footnotes = footnotes.find('blockquote')
-            chapter.append("<b>Author's Note:</b>")
-            chapter.append(footnotes)
-			
-        if None == soup:
-            raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
-    
-        return utf8FromSoup(chapter)

fanficdownloader/adapters/adapter_fanficcastletvnet.py

@@ -51,11 +51,11 @@ from base_adapter import BaseSiteAdapter, utf8FromSoup, makeDate
 # updated to reflect the class below it.  That, plus getSiteDomain()
 # take care of 'Registering'.
 def getClass():
-    return CastleFansOrgAdapter # XXX
+    return FanficCastleTVNetAdapter # XXX
 
 # Class name has to be unique.  Our convention is camel case the
 # sitename with Adapter at the end.  www is skipped.
-class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
+class FanficCastleTVNetAdapter(BaseSiteAdapter): # XXX
 
     def __init__(self, config, url):
         BaseSiteAdapter.__init__(self, config, url)
@@ -74,10 +74,10 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
         logging.debug("storyId: (%s)"%self.story.getMetadata('storyId'))
         
         # normalized story URL.
-        self._setURL('http://' + self.getSiteDomain() + '/fanfic/viewstory.php?sid='+self.story.getMetadata('storyId'))
+        self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId'))
         
         # Each adapter needs to have a unique site abbreviation.
-        self.story.setMetadata('siteabbrev','cslf') # XXX
+        self.story.setMetadata('siteabbrev','csltv') # 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
@@ -91,13 +91,13 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
     @staticmethod # must be @staticmethod, don't remove it.
     def getSiteDomain():
         # The site domain.  Does have www here, if it uses it.
-        return 'castlefans.org' # XXX
+        return 'fanfic.castletv.net' # XXX
 
     def getSiteExampleURLs(self):
-        return "http://"+self.getSiteDomain()+"/fanfic/viewstory.php?sid=1234"
+        return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234"
 
     def getSiteURLPattern(self):
-        return re.escape("http://"+self.getSiteDomain()+"/fanfic/viewstory.php?sid=")+r"\d+$"
+        return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$"
 
     ## Login seems to be reasonably standard across eFiction sites.
     def needToLoginCheck(self, data):
@@ -120,7 +120,7 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
         params['cookiecheck'] = '1'
         params['submit'] = 'Submit'
     
-        loginUrl = 'http://' + self.getSiteDomain() + '/fanfic/user.php?action=login'
+        loginUrl = 'http://' + self.getSiteDomain() + '/user.php?action=login'
         logging.debug("Will now login to URL (%s) as (%s)" % (loginUrl,
                                                               params['penname']))
     
@@ -192,7 +192,7 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
         # 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+'/fanfic/'+chapter['href']+addurl))
+            self.chapterUrls.append((stripHTML(chapter),'http://'+self.host+'/'+chapter['href']+addurl))
 
         self.story.setMetadata('numChapters',len(self.chapterUrls))
 
@@ -232,12 +232,6 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
                 for cat in catstext:
                     self.story.addToList('category',cat.string)
 
-            if 'Characters' in label:
-                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
-                charstext = [char.string for char in chars]
-                for char in charstext:
-                    self.story.addToList('characters',char.string)
-
             ## 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.
@@ -272,26 +266,6 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX
                 #value = value[0:-1]
                 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+'/fanfic/'+a['href']
-
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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):
 

fanficdownloader/adapters/adapter_fanfictionnet.py

@@ -70,11 +70,10 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter):
 
         url = self.origurl
         logging.debug("URL: "+url)
-
+        
         # use BeautifulSoup HTML parser to make everything easier to find.
         try:
             data = self._fetchUrl(url)
-            #print("\n===================\n%s\n===================\n"%data)
             soup = bs.BeautifulSoup(data)
         except urllib2.HTTPError, e:
             if e.code == 404:
@@ -84,33 +83,10 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter):
             
         if "Unable to locate story with id of " in data:
             raise exceptions.StoryDoesNotExist(url)
-
-        # some times "Chapter not found...", sometimes "Chapter text not found..."
-        if "not found. Please check to see you are not using an outdated url." in data:
+            
+        if "Chapter not found. Please check to see you are not using an outdated url." in data:
             raise exceptions.FailedToDownload("Error downloading Chapter: %s!  'Chapter not found. Please check to see you are not using an outdated url.'" % url)
-
-        try:
-            # rather nasty way to check for a newer chapter.  ffnet has a
-            # tendency to send out update notices in email before all
-            # their servers are showing the update on the first chapter.
-            try:
-                chapcount = len(soup.find('select', { 'name' : 'chapter' } ).findAll('option'))
-            # get chapter part of url.
-            except:
-                chapcount = 1
-            chapter = url.split('/',)[5]
-            tryurl = "http://%s/s/%s/%d/"%(self.getSiteDomain(),
-                                           self.story.getMetadata('storyId'),
-                                           chapcount+1)
-            print('=Trying newer chapter: %s' % tryurl)
-            newdata = self._fetchUrl(tryurl)
-            if "not found. Please check to see you are not using an outdated url." \
-                    not in newdata:
-                print('=======Found newer chapter: %s' % tryurl)
-                soup = bs.BeautifulSoup(newdata)
-        except:
-            pass
-        
+            
         # Find authorid and URL from... author url.
         a = soup.find('a', href=re.compile(r"^/u/\d+"))
         self.story.setMetadata('authorId',a['href'].split('/')[2])
@@ -142,7 +118,7 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter):
                 continue
             if 'var storyid' in script.string:
                 for line in script.string.split('\n'):
-                    m = re.match(r"^ +var ([^ ]+) = '?(.*?)'?;\r?$",line)
+                    m = re.match(r"^ +var ([^ ]+) = '?(.*?)'?;$",line)
                     if m == None : continue
                     var,value = m.groups()
                     # remove javascript escaping from values.
@@ -199,11 +175,6 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter):
         a = soup.find('a', href='http://www.fictionratings.com/')
         self.story.setMetadata('rating',a.string)
 
-        # used below to get correct characters.
-        metatext = a.findNext(text=re.compile(r' - Reviews:'))
-        if metatext == None: # indicates there's no Reviews, look for id: instead.
-            metatext = a.findNext(text=re.compile(r' - id:'))
-
         # after Rating, the same bit of text containing id:123456 contains
         # Complete--if completed.
         if 'Complete' in a.findNext(text=re.compile(r'id:'+self.story.getMetadata('storyId'))):
@@ -212,42 +183,22 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter):
             self.story.setMetadata('status', 'In-Progress')
 
         # Parse genre(s) from <meta name="description" content="..."
-        # <meta name="description" content="A Transformers/Beast Wars  - Humor fanfiction with characters Prowl & Sideswipe. Story summary: Sideswipe is bored. Prowl appears to be so, too  or at least, Sideswipe thinks he looks bored . So Sideswipe entertains them. After all, what's more fun than a race? Song-fic.">
-        # <meta name="description" content="Chapter 1 of a Transformers/Beast Wars  - Adventure/Friendship fanfiction with characters Bumblebee. TFA: What would you do if you was being abused all you life? Follow NightRunner as she goes through her spark breaking adventure of getting away from her father..">
-        # (fp)<meta name="description" content="Chapter 1 of a Sci-Fi  - Adventure/Humor fiction. Felix Max was just your regular hyperactive kid until he accidently caused his own fathers death. Now he has meta-humans trying to hunt him down with a corrupt goverment to back them up. Oh, and did I mention he has no Powers yet?.">
-        # <meta name="description" content="Chapter 1 of a Bleach  - Adventure/Angst fanfiction with characters Ichigo K. & Neliel T. O./Nel. Time travel with a twist. Time can be a real bi***. Ichigo finds that fact out when he accidentally goes back in time. Is this his second chance or is fate just screwing with him. Not a crack fic.IchixNelXHime.">
-        # <meta name="description" content="Chapter 1 of a Harry Potter and Transformers  - Humor/Adventure crossover fanfiction  with characters: Harry P. & Ironhide. IT’s one thing to be tossed thru the Veil for something he didn’t do. It was quite another to wake in his animigus form in a world not his own. Harry just knew someone was laughing at him somewhere. Mech/Mech pairings inside..">
-        m = re.match(r"^(?:Chapter \d+ of a|A) (?:.*?)  (?:- (?P<genres>.*?) )?(?:crossover )?(?:fan)?fiction(?P<chars>[ ]+with characters)?",
+        # <meta name="description" content="Chapter 1 of a Harry Potter  - Family/Friendship fanfiction. Dudley Dursley would be the first to say he lived a very normal life. But what happens when he gets invited to his cousin Harry Potter's wedding? Will Dudley get the courage to apologize for the torture he caused all those years ago? Harry/Ginny story..">
+        # <meta name="description" content="A Gundam Wing/AC and Gundam Seed  - Romance/Sci-Fi crossover fanfiction  with characters:  & Kira Y.. Story summary: One-Shoot dividido en dos partes. Kira va en camino a rescatar a Lacus, pero él no es el unico. Dos personajes de diferentes universos Gundams. SEED vs ZERO.">
+        # <meta name="description" content="Chapter 1 of a Alvin and the chipmunks and Alpha and Omega  crossover fanfiction  with characters: Alvin S. & Humphrey. You'll just have to read to find out... No Flames Plesae... and tell me what you want to see by PM'ing me....">
+        # genre is after first -, but before first 'fanfiction'.
+        m = re.match(r"^(?:Chapter \d+ of a|A) (?:.*?)  (?:- (?P<genres>.*?)) (?:crossover )?fanfiction",
                      soup.find('meta',{'name':'description'})['content'])
         if m != None:
             genres=m.group('genres')
-            if genres != None:
-                # Hurt/Comfort is one genre.
-                genres=re.sub('Hurt/Comfort','Hurt-Comfort',genres)
-                for g in genres.split('/'):
-                    self.story.addToList('genre',g)
-
-            if m.group('chars') != None:
-
-                # At this point we've proven that there's character(s)
-                # We can't reliably parse characters out of meta name="description".
-                # There's no way to tell that "with characters Ichigo K. & Neliel T. O./Nel. " ends at "Nel.", not "T."
-                # But we can pull them from the reviewstext line, now that we know about existance of chars.
-                # reviewstext can take form of:
-                # - English -  Shinji H. - Updated: 01-13-12 - Published: 12-20-11 - id:7654123
-                # - English - Adventure/Angst -  Ichigo K. & Neliel T. O./Nel - Reviews:
-                # - English - Humor/Adventure -  Harry P. & Ironhide - Reviews:
-                mc = re.match(r" - (?P<lang>[^ ]+ - )(?P<genres>[^ ]+ - )? (?P<chars>.+?) - (Reviews|Updated|Published)",
-                              metatext)
-                chars = mc.group("chars")
-                for c in chars.split(' & '):
-                    self.story.addToList('characters',c)
-        m = re.match(r" - (?P<lang>[^ ]+)",metatext)
-        if m.group('lang') != None:
-            self.story.setMetadata('language',m.group('lang'))
-                    
+            # Hurt/Comfort is one genre.
+            genres=re.sub('Hurt/Comfort','Hurt-Comfort',genres)
+            for g in genres.split('/'):
+                self.story.addToList('genre',g)
+        
         return
 
+
     def getChapterText(self, url):
         logging.debug('Getting chapter text from: %s' % url)
         time.sleep(0.5) ## ffnet(and, I assume, fpcom) tends to fail

fanficdownloader/adapters/adapter_ficbooknet.py

@@ -1,221 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2011 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 datetime
-import logging
-import re
-import urllib2
-from .. import translit
-
-from .. import BeautifulSoup as bs
-from ..htmlcleanup import stripHTML
-from .. import exceptions as exceptions
-
-from base_adapter import BaseSiteAdapter, utf8FromSoup, makeDate
-
-
-def getClass():
-    return FicBookNetAdapter
-
-
-class FicBookNetAdapter(BaseSiteAdapter):
-
-    def __init__(self, config, url):
-        BaseSiteAdapter.__init__(self, config, url)
-
-        self.decode = ["utf8",
-                       "Windows-1252"] # 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.path.split('/',)[2])
-        logging.debug("storyId: (%s)"%self.story.getMetadata('storyId'))
-        
-        # normalized story URL.
-        self._setURL('http://' + self.getSiteDomain() + '/readfic/'+self.story.getMetadata('storyId'))
-        
-        # Each adapter needs to have a unique site abbreviation.
-        self.story.setMetadata('siteabbrev','fbn')
-
-        # The date format will vary from site to site.
-        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-        self.dateformat = "%d %m %Y" 
-            
-    @staticmethod # must be @staticmethod, don't remove it.
-    def getSiteDomain():
-        # The site domain.  Does have www here, if it uses it.
-        return 'www.ficbook.net'
-
-    def getSiteExampleURLs(self):
-        return "http://"+self.getSiteDomain()+"/readfic/12345"
-
-    def getSiteURLPattern(self):
-        return re.escape("http://"+self.getSiteDomain()+"/readfic/")+r"\d+"
-
-    ## Getting the chapter list and the meta data, plus 'is adult' checking.
-    def extractChapterUrlsAndMetadata(self):
-        url=self.url
-        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
-				
-
-        # use BeautifulSoup HTML parser to make everything easier to find.
-        soup = bs.BeautifulSoup(data)
-
-        # Now go hunting for all the meta data and the chapter list.
-		
-        table = soup.find('td',{'width':'50%'})
-        
-        ## Title
-        a = soup.find('h1')
-        self.story.setMetadata('title',a.string)
-        logging.debug("Title: (%s)"%self.story.getMetadata('title'))
-        
-        # Find authorid and URL from... author url.
-        a = table.find('a')
-        self.story.setMetadata('authorId',a.text) # Author's name is unique
-        self.story.setMetadata('authorUrl','http://'+self.host+'/'+a['href'])
-        self.story.setMetadata('author',a.text)
-        logging.debug("Author: (%s)"%self.story.getMetadata('author'))
-
-        # Find the chapters:
-        chapters = soup.find('div', {'class' : 'part_list'})
-        if chapters != None:
-            chapters=chapters.findAll('a', href=re.compile(r'/readfic/'+self.story.getMetadata('storyId')+"/\d+#part_content$"))
-            self.story.setMetadata('numChapters',len(chapters))
-            for x in range(0,len(chapters)):
-                chapter=chapters[x]
-                churl='http://'+self.host+chapter['href']
-                self.chapterUrls.append((stripHTML(chapter),churl))
-                if x == 0:
-                    pubdate = translit.translit(stripHTML(bs.BeautifulSoup(self._fetchUrl(churl)).find('div', {'class' : 'part_added'}).find('span')))
-                if x == len(chapters)-1:
-                    update = translit.translit(stripHTML(bs.BeautifulSoup(self._fetchUrl(churl)).find('div', {'class' : 'part_added'}).find('span')))
-        else:
-            self.chapterUrls.append((self.story.getMetadata('title'),url))
-            self.story.setMetadata('numChapters',1)
-            pubdate=translit.translit(stripHTML(soup.find('div', {'class' : 'part_added'}).find('span')))
-            update=pubdate
-
-        logging.debug("numChapters: (%s)"%self.story.getMetadata('numChapters'))
-
-        if not ',' in pubdate:
-            pubdate=datetime.date.today().strftime(self.dateformat)
-        if not ',' in update:
-            update=datetime.date.today().strftime(self.dateformat)
-        pubdate=pubdate.split(',')[0]
-        update=update.split(',')[0]
-		
-        fullmon = {"yanvarya":"01", "января":"01",
-           "fievralya":"02", "февраля":"02",
-           "marta":"03", "марта":"03",
-           "aprielya":"04", "апреля":"04",
-           "maya":"05", "мая":"05",
-           "iyunya":"06", "июня":"06",
-           "iyulya":"07", "июля":"07",
-           "avghusta":"08", "августа":"08",
-           "sentyabrya":"09", "сентября":"09",
-           "oktyabrya":"10", "октября":"10",
-           "noyabrya":"11", "ноября":"11",
-           "diekabrya":"12", "декабря":"12" }
-        for (name,num) in fullmon.items():
-            if name in pubdate:
-                pubdate = pubdate.replace(name,num)
-            if name in update:
-                update = update.replace(name,num)
-
-        self.story.setMetadata('dateUpdated', makeDate(update, self.dateformat))
-        self.story.setMetadata('datePublished', makeDate(pubdate, self.dateformat))
-        self.story.setMetadata('language','Russian')
-		
-        pr=soup.find('a', href=re.compile(r'/printfic/\w+'))
-        pr='http://'+self.host+pr['href']
-        pr = bs.BeautifulSoup(self._fetchUrl(pr))
-        pr=pr.findAll('div', {'class' : 'part_text'})
-        i=0
-        for part in pr:
-            i=i+len(stripHTML(part).split(' '))
-        self.story.setMetadata('numWords', str(i))
-		
-        i=0
-        fandoms = table.findAll('a', href=re.compile(r'/fanfiction/\w+'))
-        for fandom in fandoms:
-            self.story.addToList('category',fandom.string)
-            i=i+1
-        if i > 1:
-            self.story.addToList('genre', 'Кроссовер')
-		
-        meta=table.findAll('a', href=re.compile(r'/ratings/'))
-        i=0
-        for m in meta:
-            if i == 0:
-                self.story.setMetadata('rating', m.find('b').text)
-                i=1
-            elif i == 1:
-                if not "," in m.nextSibling:
-                    i=2
-                self.story.addToList('genre', m.find('b').text)
-            elif i == 2:
-                self.story.addToList('warnings', m.find('b').text)
-		
-
-        if table.find('span', {'style' : 'color: green'}):
-            self.story.setMetadata('status', 'Completed')
-        else:
-            self.story.setMetadata('status', 'In Progress')
-		
-
-        tags = table.findAll('b')
-        for tag in tags:
-            label = translit.translit(tag.text)
-            if 'Piersonazhi:' in label or 'Персонажи:' in label:
-                chars=tag.nextSibling.string.split(', ')
-                for char in chars:
-                    self.story.addToList('characters',char)
-                break
-				
-        summary=soup.find('span', {'class' : 'urlize'})
-        self.story.setMetadata('description', summary.text)
-            
-    # 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.
-        
-        chapter = soup.find('div', {'class' : 'public_beta'})
-        if chapter == None:
-            chapter = soup.find('div', {'class' : 'public_beta_disabled'})
-
-        if None == chapter:
-            raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
-    
-        return utf8FromSoup(chapter)

fanficdownloader/adapters/adapter_fictionalleyorg.py

@@ -203,10 +203,6 @@ class FictionAlleyOrgSiteAdapter(BaseSiteAdapter):
 	# our div with poor html inside the story text.
 	data = data.replace('<!-- headerend -->','<crazytagstringnobodywouldstumbleonaccidently id="storytext">').replace('<!-- footerstart -->','</crazytagstringnobodywouldstumbleonaccidently>')
         
-        # problems with some stories confusing Soup.  This is a nasty
-        # hack, but it works.
-        data = data[data.index("<crazytagstringnobodywouldstumbleonaccidently"):]
-
         soup = bs.BeautifulStoneSoup(data,
                                      selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
         body = soup.findAll('body') ## some stories use a nested body and body

fanficdownloader/adapters/adapter_ficwadcom.py

@@ -152,12 +152,6 @@ class FicwadComSiteAdapter(BaseSiteAdapter):
             for g in m.group(1).split(','):
                 self.story.addToList('genre',g)
         
-        m = re.match(r".*?Characters: (.*?) -.*?",metastr)
-        if m:
-            for g in m.group(1).split(','):
-                if g:
-                    self.story.addToList('characters',g)
-        
         m = re.match(r".*?Published: ([0-9/]+?) -.*?",metastr)
         if m:
             self.story.setMetadata('datePublished',makeDate(m.group(1), "%Y/%m/%d"))
@@ -201,6 +195,9 @@ class FicwadComSiteAdapter(BaseSiteAdapter):
 
     def getChapterText(self, url):
         logging.debug('Getting chapter text from: %s' % url)
+        time.sleep(0.5) ## ffnet tends to fail more if hit too fast.
+                        ## This is in additional to what ever the
+                        ## slow_down_sleep_time setting is.
         soup = bs.BeautifulStoneSoup(self._fetchUrl(url),
                                      selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
 

fanficdownloader/adapters/adapter_fimfictionnet.py

@@ -20,7 +20,6 @@ import logging
 import re
 import urllib2
 import cookielib as cl
-import datetime
 
 from .. import BeautifulSoup as bs
 from ..htmlcleanup import stripHTML
@@ -88,10 +87,8 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
             raise exceptions.AdultCheckRequired(self.url)
         
         soup = bs.BeautifulSoup(data).find("div", {"class":"content_box post_content_box"})
-
-        titleheader = soup.find("h2")
-        title = titleheader.find("a", href=re.compile(r'^/story/')).text
-        author = titleheader.find("a", href=re.compile(r'^/user/')).text
+        
+        title, author = [link.text for link in soup.find("h2").findAll("a")]
         self.story.setMetadata("title", title)
         self.story.setMetadata("author", author)
         self.story.setMetadata("authorId", author) # The author's name will be unique
@@ -108,7 +105,7 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
         for character in [character_icon['title'] for character_icon in soup.findAll("a", {"class":"character_icon"})]:
             self.story.addToList("characters", character)
         for category in [category.text for category in soup.find("div", {"class":"categories"}).findAll("a")]:
-            self.story.addToList("genre", category)
+            self.story.addToList("category", category)
         self.story.addToList("category", "My Little Pony")
         
         
@@ -129,9 +126,7 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
         status = status_bar.text.split("|")[0].strip().replace("Incomplete", "In-Progress").replace("On Hiatus", "In-Progress").replace("Complete", "Completed")
         self.story.setMetadata('status', status)
         self.story.setMetadata('rating', status_bar.span.text)
-        # This way is less elegant, perhaps, but more robust in face of format changes.
-        numWords = status_bar.find("div",{"class":"word_count"}).b.text
-        self.story.setMetadata('numWords', numWords)
+        self.story.setMetadata('numWords', status_bar.div.b.text)
         
         description_soup = soup.find("div", {"class":"description"})
         # Sometimes the description has an expanding element
@@ -143,27 +138,18 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
             pass
         self.story.setMetadata('description', description_soup.text)
         
-        # Unfortunately, nowhere on the page is the year mentioned.
-        # Best effort to deal with this:
-        # Use this year, if that's a date in the future, subtract one year.
-        # Their earliest story is Jun, so they'll probably change the date
-        # around then.
+        # Unfortunately, nowhere on the page is the year mentioned. Because we would much rather update the story needlessly
+        # than miss an update, we hardcode the year of creation and update to be 2011.
 
-        now = datetime.datetime.now()
-        
         # Get the date of creation from the first chapter
         datePublished_text = chapterDates[0]
         day, month = datePublished_text.split()
         day = re.sub(r"[^\d.]+", '', day)
-        datePublished = makeDate("%s%s%s"%(now.year,month,day), "%Y%b%d")
-        if datePublished > now :
-            datePublished = datePublished.replace(year=now.year-1)
+        datePublished = makeDate("2011"+month+day, "%Y%b%d")
         self.story.setMetadata("datePublished", datePublished)
         dateUpdated_soup = bs.BeautifulSoup(data).find("div", {"class":"calendar"})
         dateUpdated_soup.find('span').extract()
-        dateUpdated = makeDate("%s%s"%(now.year,dateUpdated_soup.text), "%Y%b%d")
-        if dateUpdated > now :
-            dateUpdated = datePublished.replace(year=now.year-1)
+        dateUpdated = makeDate("2011"+dateUpdated_soup.text, "%Y%b%d")
         self.story.setMetadata("dateUpdated", dateUpdated)
         
     def getChapterText(self, url):
@@ -172,4 +158,4 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
         if soup == None:
             raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
         return utf8FromSoup(soup)
-        
+        

fanficdownloader/adapters/adapter_gayauthorsorg.py

@@ -1,203 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2011 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 datetime
-import logging
-import re
-import urllib2
-from urllib import unquote
-
-from .. import BeautifulSoup as bs
-from ..htmlcleanup import stripHTML
-from .. import exceptions as exceptions
-
-from base_adapter import BaseSiteAdapter, utf8FromSoup, makeDate
-
-def getClass():
-    return GayAuthorsAdapter
-
-# Class name has to be unique.  Our convention is camel case the
-# sitename with Adapter at the end.  www is skipped.
-class GayAuthorsAdapter(BaseSiteAdapter):
-
-    def __init__(self, config, url):
-        BaseSiteAdapter.__init__(self, config, url)
-
-        self.decode = ["utf8",
-                       "Windows-1252"] # 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.path.split('/',)[3])
-        logging.debug("storyId: (%s)"%self.story.getMetadata('storyId'))
-
-        # unqoute, change '_' and ' ' to '-', downcase, and remove non-[a-z0-9-]
-        authid = unquote(self.parsedUrl.path.split('/',)[2])
-        authid = authid.lower().replace('_','-').replace(' ','-')
-        authid = re.sub(r"[^a-z0-9-]","",authid)
-        
-        self.story.setMetadata('authorId',authid)
-        logging.debug("authorId: (%s)"%self.story.getMetadata('authorId'))
-        
-        # normalized story URL.
-        self._setURL('http://' + self.getSiteDomain() + '/story/'+self.story.getMetadata('authorId') + '/' + self.story.getMetadata('storyId'))
-        
-        # Each adapter needs to have a unique site abbreviation.
-        self.story.setMetadata('siteabbrev','ga')
-
-        # The date format will vary from site to site.
-        # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-        self.dateformat = "%d %b %Y"
-            
-    @staticmethod # must be @staticmethod, don't remove it.
-    def getSiteDomain():
-        # The site domain.  Does have www here, if it uses it.
-        return 'www.gayauthors.org'
-
-    def getSiteExampleURLs(self):
-        return "http://"+self.getSiteDomain()+"/story/author/storytitle"
-
-    def getSiteURLPattern(self):
-        return re.escape("http://"+self.getSiteDomain()+"/story/")+r".*?/\w+.*?$"
-
-    
-
-    ## Getting the chapter list and the meta data, plus 'is adult' checking.
-    def extractChapterUrlsAndMetadata(self):
-
-
-        url = self.url
-        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
-
-
-            
-        # 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.
-        msoup = soup.find('div', {'class' : 'story'})
-        if msoup == None:
-            msoup = soup.find('div', {'class' : 'story ispinned'})
-        csoup = soup.find('div', {'id' : 'story_chapters'})
-        
-        ## Title
-        a = msoup.find('span', {'class' : 'title'})
-        title=a.find('span', {'itemprop' : 'name'})
-        self.story.setMetadata('title',title.text)
-        try:
-            # Find Series name from series URL.
-            series = a.find('span',{'class':"description"})
-            series_name = series.find('a')
-            series_name.extract()
-            series_index = int(series.text.split(' ')[1])
-            self.setSeries(series_name.text, series_index)
-            
-        except:
-            # I find it hard to care if the series parsing fails
-            pass
-        
-        # Find authorid and URL from... author url.
-        a = msoup.find('a', href=re.compile(r'/author/'+self.story.getMetadata('authorId')))
-        self.story.setMetadata('authorUrl',a['href'])
-        self.story.setMetadata('author',a.text)
-		
-
-        # Find the chapters:
-        spans=csoup.findAll('span', {'class' : 'desc chapter-info'})
-        for span in spans:
-            span.extract()
-        for chapter in csoup.findAll('a'):
-            # just in case there's tags, like <i> in chapter titles.
-            a=chapter['href'].split(self.story.getMetadata('author'))
-            a=a[0]+self.story.getMetadata('authorId')+a[1]
-            self.chapterUrls.append((stripHTML(chapter),a))
-
-
-        self.story.setMetadata('numChapters',len(self.chapterUrls))
-		
-        cats = msoup.findAll('a', href=re.compile(r'/browse/list/page__filtertype_0__category\w+$'))
-        for cat in cats:
-            self.story.addToList('category',cat.text)
-		
-        genres = msoup.findAll('a', href=re.compile(r'/browse/list/page__filtertype_1__genre\w+$'))
-        for genre in genres:
-            self.story.addToList('genre',genre.text)
-        genres = msoup.findAll('a', href=re.compile(r'/browse/list/page__filtertype_2__tag\w+$'))
-        for genre in genres:
-            self.story.addToList('genre',genre.text)
-			
-        status = msoup.find('a', href=re.compile(r'/browse/list/page__filtertype_3__status\w+$'))
-        self.story.setMetadata('status',status.text)
-		
-        rating = msoup.find('a', href=re.compile(r'/browse/list/page__filtertype_4__rating\w+$'))
-        self.story.setMetadata('rating',rating.text)
-		
-        summary = msoup.find('span', {'itemprop' : 'description'})
-        self.story.setMetadata('description',summary.text)
-	
-
-        stats = msoup.find('dl',{'class':'info'})
-        dt = stats.findAll('dt')
-        dd = stats.findAll('dd')
-        for x in range(0,len(dt)):
-            label = dt[x].text
-            value = dd[x].text
-
-            if 'Words:' in label:
-                self.story.setMetadata('numWords', value)
-
-            if 'Published:' in label:
-                date=stripHTML(value.split(' - ')[0])
-                if ',' in date:
-                    date=datetime.date.today().strftime(self.dateformat)
-                self.story.setMetadata('datePublished', makeDate(date, self.dateformat))
-				
-            if 'Updated:' in label:
-                date=stripHTML(value.split(' - ')[0])
-                if ',' in date:
-                    date=datetime.date.today().strftime(self.dateformat)
-                self.story.setMetadata('dateUpdated', makeDate(date, self.dateformat))
-            
-    # 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' : 'chapter-content'})
-
-        if None == div:
-            raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
-    
-        return utf8FromSoup(div)

fanficdownloader/adapters/adapter_harrypotterfanfictioncom.py

@@ -159,11 +159,6 @@ class HarryPotterFanFictionComSiteAdapter(BaseSiteAdapter):
                     for g in m.group(1).split(','):
                         self.story.addToList('genre',g)
         
-                m = re.match(r".*?Characters: (.+?) Genre.*?",metastr)
-                if m:
-                    for g in m.group(1).split(','):
-                        self.story.addToList('characters',g)
-        
                 m = re.match(r".*?Warnings: (.+).*?",metastr)
                 if m:
                     for w in m.group(1).split(','):

fanficdownloader/adapters/adapter_potionsandsnitchesnet.py

@@ -145,16 +145,6 @@ class PotionsAndSnitchesNetSiteAdapter(BaseSiteAdapter):
                 for cat in catstext:
                     self.story.addToList('category',cat.string)
 
-            if 'Characters' in label:
-                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)":
-                        self.story.addToList('characters',"Snape")
-                        self.story.addToList('characters',"Harry")
-                    else:
-                        self.story.addToList('characters',char.string)
-
             if 'Genre' in label:
                 genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class'))
                 genrestext = [genre.string for genre in genres]
@@ -176,27 +166,7 @@ class PotionsAndSnitchesNetSiteAdapter(BaseSiteAdapter):
                 #value = value[0:-1]
                 self.story.setMetadata('dateUpdated', makeDate(stripHTML(value), "%b %d %Y"))
 
-        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+'/fanfiction/'+a['href']
 
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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
-            
-        
     def getChapterText(self, url):
 
         logging.debug('Getting chapter text from: %s' % url)

fanficdownloader/adapters/adapter_siyecouk.py

@@ -81,7 +81,7 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX
         return "http://"+self.getSiteDomain()+"/siye/viewstory.php?sid=1234"
 
     def getSiteURLPattern(self):
-        return re.escape("http://")+r"(www\.)?siye\.co\.uk/(siye/)?"+re.escape("viewstory.php?sid=")+r"\d+$"
+        return re.escape("http://")+r"(www\.)?"+re.escape("siye.co.uk/siye/viewstory.php?sid=")+r"\d+$"
 
     # ## Login seems to be reasonably standard across eFiction sites.
     # def needToLoginCheck(self, data):
@@ -203,10 +203,7 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX
             if part.startswith("Characters:"):
                 part = part[part.find(':')+1:]
                 for item in part.split(','):
-                    if item.strip() == "Harry/Ginny":
-                        self.story.addToList('characters',"Harry")
-                        self.story.addToList('characters',"Ginny")
-                    elif item.strip() not in ("None","All"):
+                    if item.strip() != "None":
                         self.story.addToList('characters',item)
 
             if part.startswith("Genres:"):
@@ -228,13 +225,15 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX
             if part.startswith("Summary:"):
                 part = part[part.find(':')+1:]
                 self.story.setMetadata('description',part)
-                
+
+        
+
         # want to get the next tr of the table.
         #print("%s"%titlea.parent.parent.findNextSibling('tr'))
             
         # eFiction sites don't help us out a lot with their meta data
         # formating, so it's a little ugly.
-        moremeta = stripHTML(titlea.parent.parent.parent.find('div',{'class':'desc'}))
+        moremeta = stripHTML(titlea.parent.parent.findNextSibling('tr'))
         for part in moremeta.replace(' - ','\n').split('\n'):
             #print("part:%s"%part)
             try:
@@ -257,25 +256,7 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX
             if name == 'Words':
                 self.story.setMetadata('numWords', value)
 
-        try:
-            # Find Series name from series URL.
-            a = titlea.findPrevious('a', href=re.compile(r"series.php\?seriesid=\d+"))
-            series_name = a.string
-            series_url = 'http://'+self.host+'/'+a['href']
-
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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):

fanficdownloader/adapters/adapter_tenhawkpresentscom.py

@@ -178,12 +178,6 @@ class TenhawkPresentsComSiteAdapter(BaseSiteAdapter):
                 for cat in catstext:
                     self.story.addToList('category',cat.string)
 
-            if 'Characters' in label:
-                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
-                charstext = [char.string for char in chars]
-                for char in charstext:
-                    self.story.addToList('characters',char.string)
-
             if 'Genre' in label:
                 genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class'))
                 genrestext = [genre.string for genre in genres]
@@ -205,26 +199,6 @@ class TenhawkPresentsComSiteAdapter(BaseSiteAdapter):
                 #value = value[0:-1]
                 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+'/'+a['href']
-
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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
-            
 
     def getChapterText(self, url):
 

fanficdownloader/adapters/adapter_test1.py

@@ -84,25 +84,7 @@ Some more longer description.  "I suck at summaries!"  "Better than it sounds!"
         else:
             self.story.setMetadata('dateUpdated',makeDate("1975-04-15","%Y-%m-%d"))
         self.story.setMetadata('numWords','123456')
-
-        idnum = int(self.story.getMetadata('storyId'))
-        if idnum % 2 == 1:
-            self.story.setMetadata('status','In-Progress')
-        else:
-            self.story.setMetadata('status','Completed')
-
-        langs = {
-            0:"English",
-            1:"Russian",
-            2:"French",
-            3:"German",
-            }
-        if idnum < 10:
-            self.story.setMetadata('language',langs[idnum%len(langs)])
-        # greater than 10, no language.
-            
-        self.setSeries('The Great Test',idnum)
-        
+        self.story.setMetadata('status','In-Completed')
         self.story.setMetadata('rating','Tweenie')
         
         self.story.setMetadata('authorId','98765')
@@ -114,8 +96,7 @@ Some more longer description.  "I suck at summaries!"  "Better than it sounds!"
         self.story.addToList('category','Harry Potter')
         self.story.addToList('category','Furbie')
         self.story.addToList('category','Crossover')
-        self.story.addToList('category',u'Puella Magi Madoka Magica/魔法少女まどか★マギカ')
-        self.story.addToList('category',u'Magical Girl Lyrical Nanoha')
+        
         self.story.addToList('genre','Fantasy')
         self.story.addToList('genre','SF')
         self.story.addToList('genre','Noir')
@@ -127,7 +108,7 @@ Some more longer description.  "I suck at summaries!"  "Better than it sounds!"
                             ('Chapter 4',self.url+"&chapter=5"),
                             ('Chapter 5',self.url+"&chapter=6"),
                             ('Chapter 6',self.url+"&chapter=6"),
-                            ('Chapter 7',self.url+"&chapter=6"),
+                            # ('Chapter 7',self.url+"&chapter=6"),
                             # ('Chapter 8',self.url+"&chapter=6"),
                             # ('Chapter 9',self.url+"&chapter=6"),
                             # ('Chapter 0',self.url+"&chapter=6"),

fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py

@@ -123,11 +123,6 @@ class TheWritersCoffeeShopComSiteAdapter(BaseSiteAdapter):
         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.")
             
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        data = data[data.index("<body"):] 
-        
         # use BeautifulSoup HTML parser to make everything easier to find.
         soup = bs.BeautifulSoup(data)
 
@@ -180,12 +175,6 @@ class TheWritersCoffeeShopComSiteAdapter(BaseSiteAdapter):
                 for cat in catstext:
                     self.story.addToList('category',cat.string)
 
-            if 'Characters' in label:
-                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
-                charstext = [char.string for char in chars]
-                for char in charstext:
-                    self.story.addToList('characters',char.string)
-
             if 'Genre' in label:
                 genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class'))
                 genrestext = [genre.string for genre in genres]
@@ -207,37 +196,12 @@ class TheWritersCoffeeShopComSiteAdapter(BaseSiteAdapter):
                 #value = value[0:-1]
                 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+'/library/'+a['href']
 
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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
-            
     def getChapterText(self, url):
 
         logging.debug('Getting chapter text from: %s' % url)
 
-        data = self._fetchUrl(url)
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        data = data[data.index("<body"):]
-        
-        soup = bs.BeautifulStoneSoup(data,
+        soup = bs.BeautifulStoneSoup(self._fetchUrl(url),
                                      selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
         
         span = soup.find('div', {'id' : 'story'})

fanficdownloader/adapters/adapter_tthfanficorg.py

@@ -54,14 +54,13 @@ class TwistingTheHellmouthSiteAdapter(BaseSiteAdapter):
         return 'www.tthfanfic.org'
 
     def getSiteExampleURLs(self):
-        return "http://www.tthfanfic.org/Story-5583 http://www.tthfanfic.org/Story-5583/Greywizard+Marked+By+Kane.htm http://www.tthfanfic.org/T-526321777890480578489880055880/Story-26448-15/batzulger+Willow+Rosenberg+and+the+Mind+Riders.htm"
+        return "http://www.tthfanfic.org/Story-5583 http://www.tthfanfic.org/Story-5583/Greywizard+Marked+By+Kane.htm ttp://www.tthfanfic.org/T-526321777890480578489880055880/Story-26448-15/batzulger+Willow+Rosenberg+and+the+Mind+Riders.htm"
 
     # http://www.tthfanfic.org/T-526321777848988007890480555880/Story-26448-15/batzulger+Willow+Rosenberg+and+the+Mind+Riders.htm
     # http://www.tthfanfic.org/Story-5583
     # http://www.tthfanfic.org/Story-5583/Greywizard+Marked+By+Kane.htm
-    # http://www.tthfanfic.org/story.php?no=26093
     def getSiteURLPattern(self):
-        return r"http://www.tthfanfic.org(/(T-\d+/)?Story-|/story.php\?no=)(?P<id>\d+)(-\d+)?(/.*)?$"
+        return r"http://www.tthfanfic.org/(T-\d+/)?Story-(?P<id>\d+)(-\d+)?(/.*)?$"
 
     # tth won't send you future updates if you aren't 'caught up'
     # on the story.  Login isn't required for F21, but logging in will
@@ -152,13 +151,13 @@ class TwistingTheHellmouthSiteAdapter(BaseSiteAdapter):
 
         try:
             # going to pull part of the meta data from author list page.
-            logging.debug("**AUTHOR** URL: "+self.story.getMetadata('authorUrl'))
+            logging.debug("author URL: "+self.story.getMetadata('authorUrl'))
             authordata = self._fetchUrl(self.story.getMetadata('authorUrl'))
             authorsoup = bs.BeautifulSoup(authordata)
             # author can have several pages, scan until we find it.
             while( not authorsoup.find('a', href=re.compile(r"^/Story-"+self.story.getMetadata('storyId'))) ):
                 nextpage = 'http://'+self.host+authorsoup.find('a', {'class':'arrowf'})['href']
-                logging.debug("**AUTHOR** nextpage URL: "+nextpage)
+                logging.debug("author nextpage URL: "+nextpage)
                 authordata = self._fetchUrl(nextpage)
                 authorsoup = bs.BeautifulSoup(authordata)
         except urllib2.HTTPError, e:
@@ -214,12 +213,6 @@ class TwistingTheHellmouthSiteAdapter(BaseSiteAdapter):
                 self.chapterUrls.append((stripHTML(o),url))
 
         self.story.setMetadata('numChapters',len(self.chapterUrls))
-
-        pseries = soup.find('p', {'style':'margin-top:0px'})
-        m = re.match('This story is No\. (?P<num>\d+) in the series &quot;(?P<series>.+)&quot;\.',
-                     pseries.text)
-        if m:
-            self.setSeries(m.group('series'),m.group('num'))
         
         return
 

fanficdownloader/adapters/adapter_twilightednet.py

@@ -118,12 +118,6 @@ class TwilightedNetSiteAdapter(BaseSiteAdapter):
         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.")
             
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        # twilighted isn't writing <body> ??? wtf?
-        data = "<html><body>"+data[data.index("</head>"):] 
-        
         # use BeautifulSoup HTML parser to make everything easier to find.
         soup = bs.BeautifulSoup(data)
 
@@ -176,12 +170,6 @@ class TwilightedNetSiteAdapter(BaseSiteAdapter):
                 for cat in catstext:
                     self.story.addToList('category',cat.string)
 
-            if 'Characters' in label:
-                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
-                charstext = [char.string for char in chars]
-                for char in charstext:
-                    self.story.addToList('characters',char.string)
-
             ## twilighted.net doesn't use genre.
             # if 'Genre' in label:
             #     genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class'))
@@ -204,38 +192,12 @@ class TwilightedNetSiteAdapter(BaseSiteAdapter):
                 #value = value[0:-1]
                 self.story.setMetadata('dateUpdated', makeDate(value.strip(), "%B %d, %Y"))
 
-        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+'/'+a['href']
-            
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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
 
     def getChapterText(self, url):
 
         logging.debug('Getting chapter text from: %s' % url)
 
-        data = self._fetchUrl(url)
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        # twilighted isn't writing <body> ??? wtf?
-        data = "<html><body>"+data[data.index("</head>"):] 
-        
-        soup = bs.BeautifulStoneSoup(data,
+        soup = bs.BeautifulStoneSoup(self._fetchUrl(url),
                                      selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
         
         span = soup.find('div', {'id' : 'story'})

fanficdownloader/adapters/adapter_twiwritenet.py

@@ -84,7 +84,7 @@ class TwiwriteNetSiteAdapter(BaseSiteAdapter):
         params['submit'] = 'Submit'
     
         loginUrl = 'http://' + self.getSiteDomain() + '/user.php?action=login'
-        logging.info("Will now login to URL (%s) as (%s)" % (loginUrl,
+        logging.debug("Will now login to URL (%s) as (%s)" % (loginUrl,
                                                               params['penname']))
     
         d = self._fetchUrl(loginUrl, params)
@@ -117,12 +117,7 @@ class TwiwriteNetSiteAdapter(BaseSiteAdapter):
 
         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.")
-
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        data = data[data.index("<body"):] 
-        
+            
         # use BeautifulSoup HTML parser to make everything easier to find.
         soup = bs.BeautifulSoup(data)
 
@@ -183,12 +178,6 @@ class TwiwriteNetSiteAdapter(BaseSiteAdapter):
                 for cat in catstext:
                     self.story.addToList('category',cat.string)
 
-            if 'Characters' in label:
-                chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
-                charstext = [char.string for char in chars]
-                for char in charstext:
-                    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=3'))
                 genrestext = [genre.string for genre in genres]
@@ -217,37 +206,12 @@ class TwiwriteNetSiteAdapter(BaseSiteAdapter):
                 value = value[0:-1]
                 self.story.setMetadata('dateUpdated', makeDate(value.strip(), "%B %d, %Y"))
 
-        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+'/'+a['href']
-
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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
 
     def getChapterText(self, url):
 
         logging.debug('Getting chapter text from: %s' % url)
 
-        data = self._fetchUrl(url)
-        # problems with some stories, but only in calibre.  I suspect
-        # issues with different SGML parsers in python.  This is a
-        # nasty hack, but it works.
-        data = data[data.index("<body"):]
-        
-        soup = bs.BeautifulStoneSoup(data,
+        soup = bs.BeautifulStoneSoup(self._fetchUrl(url),
                                      selfClosingTags=('br','hr')) # otherwise soup eats the br/hr tags.
         
         span = soup.find('div', {'id' : 'story'})

fanficdownloader/adapters/adapter_whoficcom.py

@@ -158,15 +158,6 @@ class WhoficComSiteAdapter(BaseSiteAdapter):
         for g in genre.split(r', '):
             self.story.addToList('genre',g)
 
-        # line 3 is characters.
-        chars = metadatachunks[3]
-        charsearch="<i>Characters:</i>"
-        if charsearch in chars:
-            chars = chars[metadatachunks[3].index(charsearch)+len(charsearch):]
-            for c in chars.split(','):
-                if c.strip() != u'None':
-                    self.story.addToList('characters',c)
-            
         # the next line is stuff with ' - ' separators *and* names--with tags.
         moremeta = metadatachunks[5]
         moremeta = re.sub(r'<[^>]+>','',moremeta) # strip tags.
@@ -189,26 +180,6 @@ class WhoficComSiteAdapter(BaseSiteAdapter):
             if name == 'Word Count':
                 self.story.setMetadata('numWords', value)
 
-        try:
-            # Find Series name from series URL.
-            a = metadata.find('a', href=re.compile(r"series.php\?seriesid=\d+"))
-            series_name = a.string
-            series_url = 'http://'+self.host+'/'+a['href']
-
-            # use BeautifulSoup HTML parser to make everything easier to find.
-            seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
-            storyas = seriessoup.findAll('a', href=re.compile(r'^viewstory.php\?sid=\d+$'))
-            i=1
-            for a in storyas:
-                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
-            
     def getChapterText(self, url):
 
         logging.debug('Getting chapter text from: %s' % url)

fanficdownloader/adapters/base_adapter.py

@@ -40,7 +40,6 @@ except:
     #logging.info("Hook to make default deadline 10.0 NOT installed--not using appengine")
 
 from ..story import Story
-from ..gziphttp import GZipProcessor
 from ..configurable import Configurable
 from ..htmlcleanup import removeEntities, removeAllEntities, stripHTML
 from ..exceptions import InvalidStoryURL
@@ -73,7 +72,7 @@ class BaseSiteAdapter(Configurable):
         self.password = ""
         self.is_adult=False
         
-        self.opener = u2.build_opener(u2.HTTPCookieProcessor(),GZipProcessor())
+        self.opener = u2.build_opener(u2.HTTPCookieProcessor())
         self.storyDone = False
         self.metadataDone = False
         self.story = Story()
@@ -229,34 +228,8 @@ class BaseSiteAdapter(Configurable):
     def getChapterText(self, url):
         "Needs to be overriden in each adapter class."
         pass
-
-    # Just for series, in case we choose to change how it's stored or represented later.
-    def setSeries(self,name,num):
-        if self.getConfig('collect_series'):
-            self.story.setMetadata('series','%s [%s]'%(name, num))
-
-fullmon = {"January":"01", "February":"02", "March":"03", "April":"04", "May":"05",
-           "June":"06","July":"07", "August":"08", "September":"09", "October":"10",
-           "November":"11", "December":"12" }
-
-def makeDate(string,format):
-    # Surprise!  Abstracting this turned out to be more useful than
-    # just saving bytes.
-
-    # fudge english month names for people who's locale is set to
-    # non-english.  All our current sites date in english, even if
-    # there's non-english content.
-    do_abbrev = "%b" in format
         
-    if "%B" in format or do_abbrev:
-        format = format.replace("%B","%m").replace("%b","%m")
-        for (name,num) in fullmon.items():
-            if do_abbrev:
-                name = name[:3] # first three for abbrev
-            if name in string:
-                string = string.replace(name,num)
-                break
-            
+def makeDate(string,format):
     return datetime.datetime.strptime(string,format)
 
 acceptable_attributes = ['href','name']

fanficdownloader/gziphttp.py

@@ -1,38 +0,0 @@
-## Borrowed from http://techknack.net/python-urllib2-handlers/
-
-import urllib2
-from gzip import GzipFile
-from StringIO import StringIO
-
-class GZipProcessor(urllib2.BaseHandler):
-    """A handler to add gzip capabilities to urllib2 requests
-    """
-    def http_request(self, req):
-        req.add_header("Accept-Encoding", "gzip")
-        return req
-    https_request = http_request
-
-    def http_response(self, req, resp):
-        #print("Content-Encoding:%s"%resp.headers.get("Content-Encoding"))
-        if resp.headers.get("Content-Encoding") == "gzip":
-            gz = GzipFile(
-                        fileobj=StringIO(resp.read()),
-                        mode="r"
-                      )
-#            resp.read = gz.read
-#            resp.readlines = gz.readlines
-#            resp.readline = gz.readline
-#            resp.next = gz.next
-            old_resp = resp
-            resp = urllib2.addinfourl(gz, old_resp.headers, old_resp.url, old_resp.code)
-            resp.msg = old_resp.msg
-        return resp
-    https_response = http_response
-
-# brave new world - 1:30 w/o, 1:10 with?  40 chapters, so 20s from sleeps.
-# with gzip, no sleep: 47.469
-# w/o gzip, no sleep: 47.736
-
-# I Am What I Am 67 chapters
-# w/o gzip: 57.168
-# w/ gzip: 40.692

fanficdownloader/htmlcleanup.py

@@ -27,7 +27,7 @@ def _unirepl(match):
     return unichr(value)
 
 def _replaceNumberEntities(data):
-    p = re.compile(r'&#(x?)([0-9a-fA-F]+);')
+    p = re.compile(r'&#(x?)(\d+);')
     return p.sub(_unirepl, data)
 
 def _replaceNotEntities(data):

fanficdownloader/story.py

@@ -15,83 +15,27 @@
 # limitations under the License.
 #
 
-import os, re
+import os
 
 from htmlcleanup import conditionalRemoveEntities, removeAllEntities
 
-# The list comes from ffnet, the only multi-language site we support
-# at the time of writing.  Values are taken largely from pycountry,
-# but with some corrections and guesses.
-langs = {
-    "English":"en",
-    "Spanish":"es",
-    "French":"fr",
-    "German":"de",
-    "Chinese":"zh",
-    "Japanese":"ja",
-    "Dutch":"nl",
-    "Portuguese":"pt",
-    "Russian":"ru",
-    "Italian":"it",
-    "Bulgarian":"bg",
-    "Polish":"pl",
-    "Hungarian":"hu",
-    "Hebrew":"he",
-    "Arabic":"ar",
-    "Swedish":"sv",
-    "Norwegian":"no",
-    "Danish":"da",
-    "Finnish":"fi",
-    "Filipino":"fil",
-    "Esperanto":"eo",
-    "Hindi":"hi",
-    "Punjabi":"pa",
-    "Farsi":"fa",
-    "Greek":"el",
-    "Romanian":"ro",
-    "Albanian":"sq",
-    "Serbian":"sr",
-    "Turkish":"tr",
-    "Czech":"cs",
-    "Indonesian":"id",
-    "Croatian":"hr",
-    "Catalan":"ca",
-    "Latin":"la",
-    "Korean":"ko",
-    "Vietnamese":"vi",
-    "Thai":"th",
-    "Devanagari":"hi",
-    }
-
 class Story:
     
     def __init__(self):
         try:
             self.metadata = {'version':os.environ['CURRENT_VERSION_ID']}
         except:
-            self.metadata = {'version':'4.3'}
-        self.replacements = []
+            self.metadata = {'version':'4.2'}
         self.chapters = [] # chapters will be tuples of (title,html)
         self.listables = {} # some items (extratags, category, warnings & genres) are also kept as lists.
 
     def setMetadata(self, key, value):
         ## still keeps < < and &
         self.metadata[key]=conditionalRemoveEntities(value)
-        if key == "language":
-            try:
-                self.metadata['langcode'] = langs[self.metadata[key]]
-            except:
-                self.metadata['langcode'] = 'en'
 
     def getMetadataRaw(self,key):
         if self.metadata.has_key(key):
             return self.metadata[key]
-
-    def doReplacments(self,value):
-        for (p,v) in self.replacements:
-            if (isinstance(value,str) or isinstance(value,unicode)) and re.match(p,value):
-                value = re.sub(p,v,value)                
-        return value;
         
     def getMetadata(self, key, removeallentities=False):
         value = None
@@ -106,22 +50,21 @@ class Story:
                     value = value.strftime("%Y-%m-%d %H:%M:%S")
                 if key == "datePublished" or key == "dateUpdated":
                  value = value.strftime("%Y-%m-%d")
-
-        value=self.doReplacments(value)
+                 
         if removeallentities and value != None:
             return removeAllEntities(value)
         else:
             return value
 
-    def getAllMetadata(self, removeallentities=False):
+    def getAllMetadata(self):
         '''
         All single value *and* list value metadata as strings.
         '''
         allmetadata = {}
         for k in self.metadata.keys():
-            allmetadata[k] = self.getMetadata(k, removeallentities)
+            allmetadata[k] = self.getMetadata(k)
         for l in self.listables.keys():
-            allmetadata[l] = self.getMetadata(l, removeallentities)
+            allmetadata[l] = self.getMetadata(l)
 
         return allmetadata
         
@@ -138,14 +81,10 @@ class Story:
     def getList(self,listname):
         if not self.listables.has_key(listname):
             return []
-        return filter( lambda x : x!=None and x!='' ,
-                       map(self.doReplacments,self.listables[listname]) )
+        return self.listables[listname]
 
     def getLists(self):
-        lsts = {}
-        for ln in self.listables.keys():
-            lsts[ln] = self.getList(ln)
-        return lsts
+        return self.listables
     
     def addChapter(self, title, html):
         self.chapters.append( (title,html) )
@@ -157,11 +96,6 @@ class Story:
     def __str__(self):
         return "Metadata: " +str(self.metadata) + "\nListables: " +str(self.listables) #+ "\nChapters: "+str(self.chapters)
 
-    def setReplace(self,replace):
-        for line in replace.splitlines():
-            if "=>" in line:
-                self.replacements.append(map( lambda x: x.strip(), line.split("=>") ))
-    
 def commaGroups(s):
     groups = []
     while s and s[-1].isdigit():

fanficdownloader/translit.py

@@ -1,57 +0,0 @@
-#-*-coding:utf-8-*-
-# Code taken from http://python.su/forum/viewtopic.php?pid=66946
-import unicodedata
-def is_syllable(letter):
-    syllables = ("A", "E", "I", "O", "U", "a", "e", "i", "o", "u")
-    if letter in syllables:
-        return True
-    return False
-def is_consonant(letter):
-    return not is_syllable(letter)
-def romanize(letter):
-    try:
-        str(letter)
-    except UnicodeEncodeError:
-        pass
-    else:
-        return str(letter)
-    unid = unicodedata.name(letter)
-    exceptions = {"NUMERO SIGN": "No", "LEFT-POINTING DOUBLE ANGLE QUOTATION MARK": "\"", "RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK": "\"", "DASH": "-"}
-    for name_contains in exceptions:
-        if unid.find(name_contains)!=-1:
-            return exceptions[name_contains]
-    assert(unid.startswith("CYRILLIC"))# Not ready to romanize anything but cyrillics
-    transformation_pairs = {"CYRILLIC CAPITAL LETTER ": str.capitalize, "CYRILLIC SMALL LETTER ": str.lower}
-    func = str.lower
-    for name_contains in transformation_pairs:
-        if unid.find(name_contains)!=-1:
-            func = transformation_pairs[name_contains]
-            unid = unid.replace(name_contains, "")
-    cyrillic_exceptions = {"YERU": "y", "SHORT I": "y", "HARD SIGN": "\'", "SOFT SIGN": "\'", "BYELORUSSIAN-UKRAINIAN I": "i", "GHE WITH UPTURN": "g", "UKRAINIAN IE": "ie", "YU": "yu", "YA": "ya"}
-    for name_contains in cyrillic_exceptions:
-        if unid.find(name_contains)!=-1:
-            return cyrillic_exceptions[name_contains]
-    if all(map(is_syllable, unid)):
-        return func(unid)
-    else:
-        return func(filter(is_consonant, unid))
-def translit(text):
-    output = ""
-    for letter in text:
-        output += romanize(letter)
-    return output
-#def main():
-    #text = u"русск.: Любя, съешь щипцы, — вздохнёт мэр, — кайф жгуч."
-    #print translit(text)
-    #text = u"укр.: Гей, хлопці, не вспію - на ґанку ваша файна їжа знищується бурундучком."
-    #print translit(text)
-    #text = u"болг.: Ах, чудна българска земьо, полюшквай цъфтящи жита."
-    #print translit(text)
-    #text = u"серб.: Неуредне ноћне даме досађивале су Џеку К."
-    #print translit(text)
-    #russk.: Lyubya, s'iesh' shchiptsy, - vzdohniot mer, - kayf zhghuch.
-    #ukr.: Ghiey, hloptsi, nie vspiyu - na ganku vasha fayna yzha znishchuiet'sya burunduchkom.
-    #bolgh.: Ah, chudna b'lgharska ziem'o, polyushkvay ts'ftyashchi zhita.
-    #sierb.: Nieuriednie notshnie damie dosadjivalie su Dzhieku K.
-if __name__=="__main__":
-    main()

fanficdownloader/writers/base_writer.py

@@ -46,15 +46,10 @@ class BaseStoryWriter(Configurable):
         
         self.adapter = adapter
         self.story = adapter.getStoryMetadataOnly() # only cache the metadata initially.
-        
-        self.story.setReplace(self.getConfig('replace_metadata'))
-        
         self.validEntries = [
             'category',
             'genre',
-            'language',
             'characters',
-            'series',
             'status',
             'datePublished',
             'dateUpdated',
@@ -81,9 +76,7 @@ class BaseStoryWriter(Configurable):
         self.titleLabels = {
             'category':'Category',
             'genre':'Genre',
-            'language':'Language',
             'status':'Status',
-            'series':'Series',
             'characters':'Characters',
             'datePublished':'Published',
             'dateUpdated':'Updated',
@@ -104,13 +97,10 @@ class BaseStoryWriter(Configurable):
             'formatname':'File Format',
             'formatext':'File Extension',
             'siteabbrev':'Site Abbrev',
-            'version':'FFDL Version'
+            'version':'FFD Version'
             }
         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))
@@ -193,18 +183,14 @@ class BaseStoryWriter(Configurable):
             self._write(out,END.substitute(self.story.metadata))
 
     # if no outstream is given, write to file.
-    def writeStory(self,outstream=None, metaonly=False, outfilename=None, forceOverwrite=False):
+    def writeStory(self,outstream=None,metaonly=False, outfilename=None):
+        for tag in self.getConfigList("extratags"):
+            self.story.addToList("extratags",tag)
 
         self.metaonly = metaonly
         if outfilename == None:
             outfilename=self.getOutputFileName()
 
-        # minor cheat, tucking css into metadata.
-        if self.getConfig("output_css"):
-            self.story.metadata["output_css"] = self.getConfig("output_css")
-        else:
-            self.story.metadata["output_css"] = ''
-            
         if not outstream:
             close=True
             logging.debug("Save directly to file: %s" % outfilename)
@@ -217,7 +203,7 @@ class BaseStoryWriter(Configurable):
                         os.mkdir(path) ## os.makedirs() doesn't work in 2.5.2?
 
             ## Check for output file date vs updated date here
-            if not (self.getConfig('always_overwrite') or forceOverwrite):
+            if not self.getConfig('always_overwrite'):
                 if os.path.exists(outfilename):
                     ## date() truncs off time, which files have, but sites don't report.
                     lastupdated=self.story.getMetadataRaw('dateUpdated').date()
@@ -263,25 +249,21 @@ class BaseStoryWriter(Configurable):
     def getTags(self):
         # set to avoid duplicates subject tags.
         subjectset = set()
-        
-        if self.story.getMetadataRaw('dateUpdated'):
-            # Last Update tags for Bill.
-            self.story.addToList('lastupdate',self.story.getMetadataRaw('dateUpdated').strftime("Last Update Year/Month: %Y/%m"))
-            self.story.addToList('lastupdate',self.story.getMetadataRaw('dateUpdated').strftime("Last Update: %Y/%m/%d"))
-        
         for entry in self.validEntries:
             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))
-                
         # listables all go into dc:subject tags, but only if they are configured.
         for (name,lst) in self.story.getLists().iteritems():
             if name in self.getConfigList("include_subject_tags"):
                 for tag in lst:
                     subjectset.add(tag)
+                    
+        for tag in self.getConfigList("extratags"):
+            subjectset.add(tag)
 
-        return list(subjectset)
+        return subjectset
             
     def writeStoryImpl(self, out):
         "Must be overriden by sub classes."

fanficdownloader/writers/writer_epub.py

@@ -41,7 +41,32 @@ class EpubWriter(BaseStoryWriter):
     def __init__(self, config, story):
         BaseStoryWriter.__init__(self, config, story)
 
-        self.EPUB_CSS = string.Template('''${output_css}''')
+        self.EPUB_CSS = string.Template('''
+body { margin: 2%;
+       text-align: justify;
+       background-color: #${background_color}; }
+pre { font-size: x-small; }
+sml { font-size: small; }
+h1 { text-align: center; }
+h2 { text-align: center; }
+h3 { text-align: center; }
+h4 { text-align: center; }
+h5 { text-align: center; }
+h6 { text-align: center; }
+.CI {
+    text-align:center;
+    margin-top:0px;
+    margin-bottom:0px;
+    padding:0px;
+    }
+.center   {text-align: center;}
+.cover    {text-align: center;}
+.full     {width: 100%; }
+.quarter  {width: 25%; }
+.smcap    {font-variant: small-caps;}
+.u        {text-decoration: underline;}
+.bold     {font-weight: bold;}
+''')
         
         self.EPUB_TITLE_PAGE_START = string.Template('''<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -203,10 +228,7 @@ class EpubWriter(BaseStoryWriter):
 
         metadata.appendChild(newTag(contentdom,"dc:contributor",text="fanficdownloader [http://fanficdownloader.googlecode.com]",attrs={"opf:role":"bkp"}))
         metadata.appendChild(newTag(contentdom,"dc:rights",text=""))
-        if self.story.getMetadata('langcode') != None:
-            metadata.appendChild(newTag(contentdom,"dc:language",text=self.story.getMetadata('langcode')))
-        else:
-            metadata.appendChild(newTag(contentdom,"dc:language",text='en'))
+        metadata.appendChild(newTag(contentdom,"dc:language",text="en"))
 
         #  published, created, updated, calibre
         #  Leave calling self.story.getMetadataRaw directly in case date format changes.
@@ -227,6 +249,9 @@ class EpubWriter(BaseStoryWriter):
             metadata.appendChild(newTag(contentdom,"meta",
                                         attrs={"name":"calibre:timestamp",
                                                "content":self.story.getMetadataRaw('dateUpdated').strftime("%Y-%m-%dT%H:%M:%S")}))
+            # Last Update tags for Bill.
+            self.story.addToList('lastupdate',self.story.getMetadataRaw('dateUpdated').strftime("Last Update Year/Month: %Y/%m"))
+            self.story.addToList('lastupdate',self.story.getMetadataRaw('dateUpdated').strftime("Last Update: %Y/%m/%d"))
         
         if self.getMetadata('description'):
             metadata.appendChild(newTag(contentdom,"dc:description",text=
@@ -339,7 +364,7 @@ class EpubWriter(BaseStoryWriter):
         del tocncxdom
 
         # write stylesheet.css file.
-        outputepub.writestr("OEBPS/stylesheet.css",self.EPUB_CSS.substitute(self.story.metadata)) 
+        outputepub.writestr("OEBPS/stylesheet.css",self.EPUB_CSS.substitute({"background_color":self.getConfig("background_color")})) 
 
         # write title page.
         if self.getConfig("titlepage_use_table"):
@@ -402,4 +427,4 @@ def newTag(dom,name,attrs=None,text=None):
     if( text is not None ):
         tag.appendChild(dom.createTextNode(text))
     return tag
-
+    

fanficdownloader/writers/writer_html.py

@@ -39,7 +39,20 @@ class HTMLWriter(BaseStoryWriter):
 <head>
 <title>${title} by ${author}</title>
 <style type="text/css">
-${output_css}
+body { background-color: #${background_color}; }
+.CI {
+    text-align:center;
+    margin-top:0px;
+    margin-bottom:0px;
+    padding:0px;
+    }
+.center   {text-align: center;}
+.cover    {text-align: center;}
+.full     {width: 100%; }
+.quarter  {width: 25%; }
+.smcap    {font-variant: small-caps;}
+.u        {text-decoration: underline;}
+.bold     {font-weight: bold;}
 </style>
 </head>
 <body>
@@ -82,6 +95,9 @@ ${output_css}
 
     def writeStoryImpl(self, out):
 
+        # minor cheat, tucking bg into metadata.
+        if self.getConfig("background_color"):
+            self.story.metadata["background_color"] = self.getConfig("background_color")
         self._write(out,self.HTML_FILE_START.substitute(self.story.metadata))
 
         self.writeTitlePage(out,

fanficdownloader/writers/writer_mobi.py

@@ -41,6 +41,7 @@ class MobiWriter(BaseStoryWriter):
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>${title} by ${author}</title>
+<link href="stylesheet.css" type="text/css" charset="UTF-8" rel="stylesheet"/>
 </head>
 <body>
 <h3><a href="${storyUrl}">${title}</a> by <a href="${authorUrl}">${author}</a></h3>
@@ -63,6 +64,7 @@ class MobiWriter(BaseStoryWriter):
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>${title} by ${author}</title>
+<link href="stylesheet.css" type="text/css" charset="UTF-8" rel="stylesheet"/>
 </head>
 <body>
 <h3><a href="${storyUrl}">${title}</a> by <a href="${authorUrl}">${author}</a></h3>
@@ -89,6 +91,7 @@ class MobiWriter(BaseStoryWriter):
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>${title} by ${author}</title>
+<link href="stylesheet.css" type="text/css" charset="UTF-8" rel="stylesheet"/>
 </head>
 <body>
 <div>
@@ -110,6 +113,7 @@ class MobiWriter(BaseStoryWriter):
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>${chapter}</title>
+<link href="stylesheet.css" type="text/css" charset="UTF-8" rel="stylesheet"/>
 </head>
 <body>
 <h3>${chapter}</h3>

index-ajax.html

@@ -4,7 +4,7 @@
 		<link href="css/index.css" rel="stylesheet" type="text/css">
 		<link type="text/css" href="http://jqueryui.com/latest/themes/base/ui.all.css" rel="stylesheet" />
 	 
-		<title>FanFictionDownLoader (fanfiction.net, fictionalley, ficwad to epub and HTML)</title>
+		<title>Fanfiction Downloader (fanfiction.net, fictionalley, ficwad to epub and HTML)</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 		<script src="/js/jquery-1.3.2.js"></script>
 		<script src="/js/fdownloader.js"></script>
@@ -16,7 +16,7 @@
 	<body>
 		<div id='main'>
 			<h1>
-				<a href="/" style="text-decoration: none; color: black;">FanFictionDownLoader</a>
+				<a href="/" style="text-decoration: none; color: black;">FanFiction Downloader</a>
 			</h1>
 				
 <!--			<form action="/fdown" method="post"> -->
@@ -91,8 +91,8 @@
 					<img src="http://code.google.com/appengine/images/appengine-silver-120x30.gif"
 					alt="Powered by Google App Engine" />
 					<br/><br/>
-	This is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">FanFictionDownLoader</a><br/>
-	Copyright &copy; Fanficdownloader team
+					FanfictionLoader is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">fanficdownloader</a><br/>
+					Copyright &copy; <a href="http://twitter.com/sigizmund">Roman Kirillov</a>
 				</div>
 <!--			</form> -->
 		</div>

index.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <link href="/css/index.css" rel="stylesheet" type="text/css">
-    <title>FanFictionDownLoader - read fanfiction from twilighted.net, fanfiction.net, fictionpress.com, fictionalley.org, ficwad.com, potionsandsnitches.net, harrypotterfanfiction.com, mediaminer.org on Kindle, Nook, Sony Reader, iPad, iPhone, Android, Aldiko, Stanza</title>
+    <title>Fanfiction Downloader - read fanfiction from twilighted.net, fanfiction.net, fictionpress.com, fictionalley.org, ficwad.com, potionsandsnitches.net, harrypotterfanfiction.com, mediaminer.org on Kindle, Nook, Sony Reader, iPad, iPhone, Android, Aldiko, Stanza</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="google-site-verification" content="kCFc-G4bka_pJN6Rv8CapPBcwmq0hbAUZPkKWqRsAYU" />
     <script type="text/javascript">
@@ -26,7 +26,7 @@
   <body>
     <div id='main'>
       <h1>
-	<a href="/" style="text-decoration: none; color: black;">FanFictionDownLoader</a> <g:plusone size="medium"></g:plusone>
+	<a href="/" style="text-decoration: none; color: black;">FanFiction Downloader</a> <g:plusone size="medium"></g:plusone>
       </h1>
 
       <div style="text-align: center">
@@ -50,19 +50,27 @@
       <form action="/fdown" method="post">
 	<div id='urlbox'>
 	  <div id='greeting'>
-	    <p>Hi, {{ nickname }}! This is FanFictionDownLoader, which makes reading stories from various websites
+	    <p>Hi, {{ nickname }}! This is a fan fiction downloader, which makes reading stories from various websites
 	      much easier. </p>
 	  </div>
 	  <!-- put announcements here, h3 is a good title size. -->
-	  <h3>New Site gayauthors.org</h3>
+	  <h3>This is the Official Multithreading Version</h3>
 	  <p>
-	    Thanks to Ida Leter's hard work, we now support <a href="http://www.gayauthors.org">gayauthors.org</a>, a fanfiction site specializing in gay stories.
+	    This version of the application uses Python 2.7 and
+	    multithreading to try and reduce our usage.  Google
+	    considers Python 2.7 Experimental still, so there may be issues.
+	  </p>
+	  <p>
+	    <b>New Site</b><br />
+	    Now supporting www.siye.co.uk.
 	  </p>
 	  <p>
 	    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-3-1.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
+	    the <a href="http://groups.google.com/group/fanfic-downloader">Fanfiction
+	      Downloader Google Group</a>.  The
+	    <a href="http://4-0-7.fanfictiondownloader.appspot.com">Previous
+	      Version</a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>
 	    {{ error_message }}
@@ -98,33 +106,14 @@
       <div id='urlbox'>
 	<div id='greeting'>
 	  <p>
-	    This is a FanFictionDownLoader, which makes reading stories from various websites much easier. Before you
-	    can start downloading fanfics, you need to login, so FanFictionDownLoader can remember your fanfics and store them.
+	    This is a fan fiction downloader, which makes reading stories from various websites much easier. Before you
+	    can start downloading fanfics, you need to login, so downloader can remember your fanfics and store them.
 	  </p>
 	  <p><a href="{{ login_url }}">Login using Google account</a></p>
 	</div>
       </div>
       {% endif %}
       
-      <div id='typebox'>
-	  <p>
-	    <b>FanFictionDownLoader calibre Plugin</b>
-	    <br /><br />
-	    
-	    There's now a version of this downloader that runs
-	    entirely inside the
-	    popular <a href="http://calibre-ebook.com/">calibre</a>
-	    ebook management package as a plugin.
-	    
-	    <br /><br />
-	    
-	    Once you have calibre installed and running, inside
-	    calibre, you can go to 'Get plugins to enhance calibre' or
-	    'Get new plugins' and
-	    install <a href="http://www.mobileread.com/forums/showthread.php?t=163261">FanFictionDownLoader</a>.
-	    
-	  </p>
-      </div>
       <div id='helpbox'>
 	<dl>
 	  <dt>fictionalley.org</dt>
@@ -201,10 +190,10 @@
 	    Use the URL of the story's chapter list, such as
 	    <br /><a href="http://fanfiction.tenhawkpresents.com/viewstory.php?sid=294">http://fanfiction.tenhawkpresents.com/viewstory.php?sid=294</a>.
 	  </dd>
-	  <dt>castlefans.org</dt>
+	  <dt>fanfic.castletv.net</dt>
 	  <dd>
 	    Use the URL of the story's chapter list, such as
-	    <br /><a href="http://castlefans.org/fanfic/viewstory.php?sid=123">http://castlefans.org/fanfic/viewstory.php?sid=123</a>.
+	    <br /><a href="http://fanfic.castletv.net/viewstory.php?sid=123">http://fanfic.castletv.net/viewstory.php?sid=123</a>.
 	  </dd>
 	  <dt>fimfiction.net</dt>
 	  <dd>
@@ -225,28 +214,10 @@
 	    Use the URL of the story's chapter list, such as
 	    <br /><a href="http://www.siye.co.uk/siye/viewstory.php?sid=123">http://www.siye.co.uk/siye/viewstory.php?sid=123</a>.
 	  </dd>
-	  <dt>archiveofourown.org</dt>
-	  <dd>
-	    Use the URL of the story, or one of it's chapters, such as
-	    <br /><a href="http://archiveofourown.org/works/76366">http://archiveofourown.org/works/76366</a>.
-	    <br /><a href="http://archiveofourown.org/works/76366/chapters/101584">http://archiveofourown.org/works/76366/chapters/101584</a>.
-	  </dd>
-	  <dt>ficbook.net(Russian)</dt>
-	  <dd>
-	    Use the URL of the story, or one of it's chapters, such as
-	    <br /><a href="http://ficbook.net/readfic/93626">http://ficbook.net/readfic/93626</a>.
-	    <br /><a href="http://ficbook.net/readfic/93626/246417#part_content">http://ficbook.net/readfic/93626/246417#part_content</a>.
-	  </dd>
-	  <dt>gayauthors.org</dt>
-	  <dd>
-	    Use the URL of the story, or one of it's chapters, such as
-	    <br /><a href="http://www.gayauthors.org/story/mark-arbour/stvincent">http://www.gayauthors.org/story/mark-arbour/stvincent</a>.
-	    <br /><a href="http://www.gayauthors.org/story/Mark%20Arbour/stvincent/7">http://www.gayauthors.org/story/Mark Arbour/stvincent/7</a>.
-	  </dd>
-	</dl>
-	<p>
-	  A few additional things to know, which will make your life substantially easier:
-	</p>
+	</dl>	
+
+	
+	A few additional things to know, which will make your life substantially easier:
 	<ol>
 	  <li>
 	    First thing to know: I do not use your Google login and password. In fact, all I know about it is your ID &ndash; password
@@ -279,8 +250,8 @@
 	<img src="http://code.google.com/appengine/images/appengine-silver-120x30.gif"
 	     alt="Powered by Google App Engine" />
 	<br/><br/>
-	This is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">FanFictionDownLoader</a><br/>
-	Copyright &copy; FanFictionDownLoader team
+	FanfictionLoader is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">fanficdownloader</a><br/>
+	Copyright &copy; Fanficdownloader team
       </div>
 
       <div style="margin-top: 1em; text-align: center'">

login.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <link href="/css/index.css" rel="stylesheet" type="text/css">
-    <title>Login Needed FanFictionDownLoader</title>
+    <title>Login Needed Fanfiction Downloader</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="google-site-verification" content="kCFc-G4bka_pJN6Rv8CapPBcwmq0hbAUZPkKWqRsAYU" />
     <script type="text/javascript">
@@ -22,7 +22,7 @@
   <body>
     <div id='main'>
       <h1>
-	<a href="/" style="text-decoration: none; color: black;">FanFictionDownLoader</a>
+	<a href="/" style="text-decoration: none; color: black;">FanFiction Downloader</a>
       </h1>
 
       <div style="text-align: center">
@@ -88,8 +88,8 @@
 	<img src="http://code.google.com/appengine/images/appengine-silver-120x30.gif"
 	     alt="Powered by Google App Engine" />
 	<br/><br/>
-	This is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">FanFictionDownLoader</a><br/>
-	Copyright &copy; FanFictionDownLoader team
+	FanfictionLoader is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">fanficdownloader</a><br/>
+	Copyright &copy; Fanficdownloader team
       </div>
 
       <div style="margin-top: 1em; text-align: center'">

makeplugin.py

@@ -27,7 +27,7 @@ if __name__=="__main__":
     exclude=['*.pyc','*~','*.xcf']
     # from top dir. 'w' for overwrite
     createZipFile(filename,"w",
-                  ['plugin-defaults.ini','plugin-example.ini','epubmerge.py','fanficdownloader'],
+                  ['defaults.ini','example.ini','epubmerge.py','fanficdownloader'],
                   exclude=exclude)
     #from calibre-plugin dir. 'a' for append
     os.chdir('calibre-plugin')

plugin-defaults.ini

@@ -1,343 +0,0 @@
-# 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.
-#
-
-[defaults]
-
-## [defaults] section applies to all formats and sites but may be
-## overridden at several levels
-
-## Some sites also 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
-
-## All available titlepage_entries and the label used for them:
-## <entryname>_label:<label>
-## Labels may be customized.
-title_label:Title
-storyUrl_label:Story URL
-description_label:Summary
-author_label:Author
-authorUrl_label:Author URL
-## epub, txt, html
-formatname_label:File Format
-## .epub, .txt, .html
-formatext_label:File Extension
-## Category and Genre have overlap, depending on the site.
-## Sometimes Harry Potter is a category and Fantasy a genre. (fanfiction.net)
-## Sometimes Fantasy is category *and* a genre (fictionpress.com)
-## Sometimes there are multiple categories and/or genres.
-category_label:Category
-genre_label:Genre
-language_label:Language
-characters_label:Characters
-series_label:Series
-## Completed/In-Progress
-status_label:Status
-## Dates story first published, last updated, and downloaded(last with time).
-datePublished_label:Published
-dateUpdated_label:Updated
-dateCreated_label:Packaged
-## Rating depends on the site.  Some use K,T,M,etc, and some PG,R,NC-17
-rating_label:Rating
-## Also depends on the site.  
-warnings_label:Warnings
-numChapters_label:Chapters
-numWords_label:Words
-## www.fanfiction.net, fictionalley.com, etc.
-site_label:Publisher
-## ffnet, fpcom, etc.
-siteabbrev_label:Site Abbrev
-## The site's unique story/author identifier.  Usually a number.
-storyId_label:Story ID
-authorId_label:Author ID
-## Primarily to put specific values in dc:subject tags for epub.  Will
-## show up in Calibre as tags.  Also carried into mobi when converted.
-extratags_label:Extra Tags
-## The version of fanficdownloader
-##
-version_label:FFDL Version
-
-## items to include in the title page
-## Empty entries will *not* appear, even if in the list.
-## 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
-
-## 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.
-collect_series: true
-
-## include title page as first page.
-include_titlepage: true
-
-## include a TOC page before the story text
-include_tocpage: true
-
-## website encoding(s) In theory, each website reports the character
-## encoding they use for each page.  In practice, some sites report it
-## incorrectly.  Each adapter has a default list, usually "utf8,
-## Windows-1252" or "Windows-1252, utf8", but this will let you
-## explicitly set the encoding and order if you need to.  The special
-## value 'auto' will call chardet and use the encoding it reports if
-## it has +90% confidence.  'auto' is not reliable.
-#website_encodings: auto, utf8, Windows-1252
-
-## 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
-
-## extra tags (comma separated) to include, primarily for epub.
-extratags: FanFiction
-
-## 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
-
-## output background color--only used by html and epub (and ignored in
-## epub by many readers).  Must be hex code, # will be added.
-background_color: ffffff
-
-## Use regular expressions to find and replace (or remove) metadata.
-## For example, you could change Sci-Fi=>SF, remove *-Centered tags,
-## etc.  See http://docs.python.org/library/re.html (look for re.sub)
-## for regexp details.
-## Make sure to keep at least one space at the start of each line and
-## to escape % to %%, if used.
-#replace_metadata:
-# Sci-Fi=>SF
-# Puella Magi Madoka Magica.* => Madoka
-# Comedy=>Humor
-# Crossover: (.*)=>\1
-# (.*)Great(.*)=>\1Moderate\2
-# .*-Centered=>
-
-## Each output format has a section that overrides [defaults]
-[html]
-
-## output background color--only used by html and epub (and ignored in
-## epub by many readers).  Included below in output_css--will be
-## ignored if not in output_css.
-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.
-output_css:
- body { background-color: #%(background_color)s; }
- .CI {
-     text-align:center;
-     margin-top:0px;
-     margin-bottom:0px;
-     padding:0px;
-     }
- .center   {text-align: center;}
- .cover    {text-align: center;}
- .full     {width: 100%%; }
- .quarter  {width: 25%%; }
- .smcap    {font-variant: small-caps;}
- .u        {text-decoration: underline;}
- .bold     {font-weight: bold;}
-
-[txt]
-## Add URLs since there aren't links.
-titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,storyUrl, authorUrl, description
-
-## use \r\n for line endings, the windows convention.  text output only.
-windows_eol: true
-
-[txt]
-## Add URLs since there aren't links.
-titlepage_entries: series,category,genre,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,numWords,site,storyUrl, authorUrl, description
-
-## use \r\n for line endings, the windows convention.  text output only.
-windows_eol: true
-
-[epub]
-
-## epub carries the TOC in metadata.
-## mobi generated from epub will have a TOC at the end.
-include_tocpage: false
-
-## epub->mobi conversions typically don't like tables.
-titlepage_use_table: false
-
-## When using tables, make these span both columns.
-wide_titlepage_entries: description, storyUrl, author URL
-
-## output background color--only used by html and epub (and ignored in
-## epub by many readers).  Included below in output_css--will be
-## ignored if not in output_css.
-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.
-output_css: 
- body { background-color: #%(background_color)s;
-        text-align: justify;
-        margin: 2%%; }
- pre { font-size: x-small; }
- sml { font-size: small; }
- h1 { text-align: center; }
- h2 { text-align: center; }
- h3 { text-align: center; }
- h4 { text-align: center; }
- h5 { text-align: center; }
- h6 { text-align: center; }
- .CI {
-     text-align:center;
-     margin-top:0px;
-     margin-bottom:0px;
-     padding:0px;
-     }
- .center   {text-align: center;}
- .cover    {text-align: center;}
- .full     {width: 100%%; }
- .quarter  {width: 25%%; }
- .smcap    {font-variant: small-caps;}
- .u        {text-decoration: underline;}
- .bold     {font-weight: bold;}
-
-[mobi]
-## mobi TOC cannot be turned off right now.
-#include_tocpage: true
-
-
-## Each site has a section that overrides [defaults] *and* the format
-## sections test1.com specifically is not a real story site.  Instead,
-## it is a fake site for testing configuration and output.  It uses
-## URLs like: http://test1.com?sid=12345
-[test1.com]
-extratags: FanFiction,Testing
-
-## If necessary, you can define [<site>:<format>] sections to
-## customize the formats differently for the same site.  Overrides
-## defaults, format and site.
-[test1.com:txt]
-extratags: FanFiction,Testing,Text
-
-[test1.com:html]
-extratags: FanFiction,Testing,HTML
-
-[www.fanfiction.net]
-
-[www.fictionpress.com]
-## Clear FanFiction from defaults, fictionpress.com is original fiction.
-extratags:
-
-[www.ficwad.com]
-## 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
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-[www.twilighted.net]
-## 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
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## twilighted.net (ab)uses series as personal reading lists.
-collect_series: false
-
-[www.twiwrite.net]
-## 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
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## twiwrite.net (ab)uses series as personal reading lists.
-collect_series: false
-
-[www.whofic.com]
-
-[www.mediaminer.org]
-
-[www.thewriterscoffeeshop.com]
-## 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
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## Some sites also 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
-
-## thewriterscoffeeshop.com (ab)uses series as personal reading lists.
-collect_series: false
-
-[www.ficwad.com]
-## 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
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-[www.adastrafanfic.com]
-## 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.fictionalley.org]
-## 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.harrypotterfanfiction.com]
-## 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.fimfiction.net]
-## 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.tthfanfic.org]
-## 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
-## tth is a little unusual--it doesn't require user/pass, but the site
-## keeps track of which chapters you've read and won't send another
-## update until it thinks you're up to date.  This way, on download,
-## it thinks you're up to date.
-#username:YourName
-#password:yourpassword
-
-[overrides]
-## It may sometimes be useful to override all of the specific format,
-## site and site:format sections in your private configuration.  For
-## example, this extratags param here would override all of the
-## extratags params in all other sections.  Only commandline options
-## beat overrides.
-#extratags:fanficdownloader

plugin-example.ini

@@ -1,74 +0,0 @@
-## This is an example of what your personal configuration might look
-## like.
-
-[defaults]
-## Some sites also 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
-
-## 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.
-[www.twilighted.net]
-#username:YourPenname
-#password:YourPassword
-## default is false
-#collect_series: true
-
-[www.ficwad.com]
-#username:YourUsername
-#password:YourPassword
-
-[www.twiwrite.net]
-#username:YourName
-#password:yourpassword
-## default is false
-#collect_series: true
-
-[www.adastrafanfic.com]
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content.
-#is_adult:true
-
-[www.thewriterscoffeeshop.com]
-#username:YourName
-#password:yourpassword
-#is_adult:true
-## default is false
-#collect_series: true
-
-[www.fictionalley.org]
-#is_adult:true
-
-[www.harrypotterfanfiction.com]
-#is_adult:true
-
-[www.fimfiction.net]
-#is_adult:true
-
-[www.tthfanfic.org]
-#is_adult:true
-## tth is a little unusual--it doesn't require user/pass, but the site
-## keeps track of which chapters you've read and won't send another
-## update until it thinks you're up to date.  This way, on download,
-## it thinks you're up to date.
-#username:YourName
-#password:yourpassword
-
-
-## This section will override anything in the system defaults or other
-## sections here.
-[overrides]
-## default varies by site.  Set true here to force all sites to
-## collect series.
-#collect_series: true

recent.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <link href="/css/index.css" rel="stylesheet" type="text/css">
-    <title>FanFictionDownLoader (fanfiction.net, fanficauthors, fictionalley, ficwad to epub and HTML)</title>
+    <title>Fanfiction Downloader (fanfiction.net, fanficauthors, fictionalley, ficwad to epub and HTML)</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <script type="text/javascript">
 
@@ -21,7 +21,7 @@
   <body>
     <div id='main'>
       <h1>
-	<a href="/" style="text-decoration: none; color: black;">FanFictionDownLoader</a>
+	<a href="/" style="text-decoration: none; color: black;">FanFiction Downloader</a>
       </h1>
       
       <script type="text/javascript"><!--
@@ -45,7 +45,7 @@
 	  <p><a href="/clearrecent">Clear your Recent Downloads List</a></p>
 	</div>
       </div>
-
+      
       <div id='helpbox'>
 	{% for fic in fics %}
 	<p>

status.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <link href="/css/index.css" rel="stylesheet" type="text/css">
-    <title>{% if fic.completed %} Finished {% else %} {% if fic.failure %} Failed {% else %} Working... {% endif %} {% endif %} - FanFictionDownLoader</title>
+    <title>{% if fic.completed %} Finished {% else %} {% if fic.failure %} Failed {% else %} Working... {% endif %} {% endif %} - Fanfiction Downloader</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="google-site-verification" content="kCFc-G4bka_pJN6Rv8CapPBcwmq0hbAUZPkKWqRsAYU" />
     {% if not fic.completed and not fic.failure %}
@@ -25,7 +25,7 @@
   <body>
     <div id='main'>
       <h1>
-	<a href="/" style="text-decoration: none; color: black;">FanFictionDownLoader</a>
+	<a href="/" style="text-decoration: none; color: black;">FanFiction Downloader</a>
       </h1>
       <div style="text-align: center">
         <script type="text/javascript"><!--
@@ -67,12 +67,11 @@
 	{% endif %}
 	  <p>See your personal list of <a href="/recent">previously downloaded fanfics</a>.</p>
       </div>
-
       <div style='text-align: center'>
 	<img src="http://code.google.com/appengine/images/appengine-silver-120x30.gif"
 	     alt="Powered by Google App Engine" />
 	<br/><br/>
-	This is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">FanFictionDownLoader</a><br/>
+	FanfictionLoader is a web front-end to <A href="http://code.google.com/p/fanficdownloader/">fanficdownloader</a><br/>
 	Copyright &copy; Fanficdownloader team
       </div>