Fix for siye.co.uk stories with HTML in the title, bump versions.

app.yaml

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

calibre-plugin/__init__.py

@@ -26,7 +26,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, 27)
+    version             = (1, 7, 28)
     minimum_calibre_version = (0, 8, 57)
 
     #: This field defines the GUI plugin class that contains all the code

calibre-plugin/config.py

@@ -15,8 +15,8 @@ from PyQt4.Qt import (QDialog, QWidget, QVBoxLayout, QHBoxLayout, QLabel,
                       QCheckBox, QPushButton, QTabWidget, QVariant, QScrollArea,
                       QDialogButtonBox )
 
-from calibre.utils.config import JSONConfig
 from calibre.gui2.ui import get_gui
+from calibre.gui2 import dynamic, info_dialog
 
 from calibre_plugins.fanfictiondownloader_plugin.prefs import prefs, PREFS_NAMESPACE
 from calibre_plugins.fanfictiondownloader_plugin.dialogs \

calibre-plugin/ffdl_plugin.py

@@ -1668,7 +1668,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction):
                     # identifiers have :->| in uri.
                     # print("uri from ident uri:%s"%identifiers['uri'].replace('|',':'))
                     return identifiers['uri'].replace('|',':')
-            elif path.lower().endswith('.epub'):
+            elif path and path.lower().endswith('.epub'):
                 existingepub = path
                 
             ## only epub has URL in it--at least where I can easily find it.

fanficdownloader/adapters/adapter_siyecouk.py

@@ -110,7 +110,7 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX
 
         ## Title
         titlea = authsoup.find('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+"$"))
-        self.story.setMetadata('title',titlea.string)
+        self.story.setMetadata('title',stripHTML(titlea))
         
         # Find the chapters (from soup, not authsoup):
         for chapter in soup.findAll('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+"&chapter=\d+$")):

index.html

@@ -53,14 +53,14 @@
 	    <p>Hi, {{ nickname }}! This is FanFictionDownLoader, which makes reading stories from various websites
 	      much easier. </p>
 	  </div>
-	  <!-- put announcements here, h3 is a good title size. -->
+	  <!-- put announcements here, h3 is a good title size.
 	  <h3>Changes:</h3>
 	  <p>
 	    <ul>
-	      <li>Fixes for nha.magical-worlds.us and scarvesandcoffee.net.</li>
-	      <li>Fall back category parsing for fanfiction.net when story has a broken crossover category link.</li>
+	      <li></li>
 	    </ul>
 	  </p>
+	   -->
 	  <p>
 	    Questions?  Check out our 
 	    <a href="http://code.google.com/p/fanficdownloader/wiki/FanFictionDownloaderFAQs">FAQs</a>.