YA fix for fanfiction.net changes, fix for collision setting, shorten PI name.

app.yaml

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

calibre-plugin/__init__.py

@@ -27,7 +27,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
     description         = 'UI plugin to download FanFiction stories from various sites.'
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (1, 7, 16)
+    version             = (1, 7, 17)
     minimum_calibre_version = (0, 8, 57)
 
     #: This field defines the GUI plugin class that contains all the code

calibre-plugin/dialogs.py

@@ -318,15 +318,16 @@ class AddNewDialog(SizePersistedDialog):
         if not self.merge:
             self.fileform.setCurrentIndex(self.fileform.findText(self.prefs['fileform']))
 
-        if self.merge and not self.newmerge:
-            self.set_collisions()
-            i = self.collision.findText(self.prefs['collision'])
-            if i > -1:
-                self.collision.setCurrentIndex(i)
-            self.updatemeta.setChecked(self.prefs['updatemeta'])
-
-            if not self.merge:
-                self.updateepubcover.setChecked(self.prefs['updateepubcover'])
+        # add collision options
+        self.set_collisions()
+        
+        i = self.collision.findText(self.prefs['collision'])
+        if i > -1:
+            self.collision.setCurrentIndex(i)
+        self.updatemeta.setChecked(self.prefs['updatemeta'])
+            
+        if not self.merge:
+            self.updateepubcover.setChecked(self.prefs['updateepubcover'])
                 
         self.url.setText(url_list_text)
         if url_list_text:

calibre-plugin/ffdl_plugin.py

@@ -102,7 +102,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
         # are not found in the zip file will result in null QIcons.
         icon = get_icon('images/icon.png')
 
-        #self.qaction.setText('FFDL')
+        self.qaction.setText('FanFictionDL')
         
         # The qaction is automatically created from the action_spec defined
         # above

fanficdownloader/adapters/adapter_fanfictionnet.py

@@ -158,10 +158,14 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter):
         if summarydiv:
             self.setDescription(url,stripHTML(summarydiv))
             
-        
-        metatext = stripHTML(gui_table1i.find('div', {'class':'xgray'})).replace('Hurt/Comfort','Hurt-Comfort')
+
+        graydiv = gui_table1i.find('div', {'class':'xgray'})
+        for b in graydiv.findAll('button'):
+            b.extract()
+        metatext = stripHTML(graydiv).replace('Hurt/Comfort','Hurt-Comfort')
+        #logger.debug("metatext:(%s)"%metatext)
         metalist = metatext.split(" - ")
-        logger.debug("metatext:(%s)"%metalist)
+        #logger.debug("metalist:(%s)"%metalist)
 
         # Rated: Fiction K - English - Words: 158,078 - Published: 02-04-11