Bump versions.

calibre-plugin/__init__.py

@@ -48,7 +48,7 @@ class FanFicFareBase(InterfaceActionBase):
     description         = _('UI plugin to download FanFiction stories from various sites.')
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (2, 3, 3)
+    version             = (2, 3, 4)
     minimum_calibre_version = (1, 48, 0)
 
     #: This field defines the GUI plugin class that contains all the code

calibre-plugin/translations/de.po

@@ -4,6 +4,7 @@
 # Translators:
 # Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 # ILB, 2014-2016
+# jumo none, 2016
 # Sebastian Keller <Haggard@gmx.de>, 2015
 # Simon_Schuette <simonschuette@arcor.de>, 2014-2016
 # Simon S, 2015
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
 "POT-Creation-Date: 2016-04-28 16:06+Central Daylight Time\n"
-"PO-Revision-Date: 2016-04-16 14:33+0000\n"
-"Last-Translator: ILB\n"
+"PO-Revision-Date: 2016-06-22 21:43+0000\n"
+"Last-Translator: jumo none\n"
 "Language-Team: German (http://www.transifex.com/calibre/calibre-plugins/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -962,7 +963,7 @@ msgstr "Wenn eine Aktualisierung oder Überschreibung einer existierenden Story
 
 #: config.py:1354
 msgid "Save All Errors"
-msgstr ""
+msgstr "Speicher alle Fehler"
 
 #: config.py:1355
 msgid "If unchecked, these errors will not be saved:%s"
@@ -2116,7 +2117,7 @@ msgstr "FanFiction-Geschichten herunterladen"
 
 #: jobs.py:91
 msgid "%d of %d stories finished downloading"
-msgstr ""
+msgstr "%d von %d der Geschichten sind fertig runtergeladen"
 
 #: jobs.py:103
 msgid "Download Results:"

calibre-plugin/translations/es.po

@@ -2,17 +2,18 @@
 # Copyright (C) YEAR ORGANIZATION
 # 
 # Translators:
-# Fitoschido, 2014
+# Adolfo Jayme-Barrientos, 2014
 # dario hereñu <magallania@gmail.com>, 2015
 # Jellby <jellby@yahoo.com>, 2014-2016
 # Antonio Mireles <antonio@mirelesindependent.com>, 2016
+# juanda097 <juanda097@openmailbox.org>, 2016
 # JimmXinu <retiefjimm@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
 "POT-Creation-Date: 2016-04-28 16:06+Central Daylight Time\n"
-"PO-Revision-Date: 2016-04-13 22:04+0000\n"
-"Last-Translator: Antonio Mireles <antonio@mirelesindependent.com>\n"
+"PO-Revision-Date: 2016-05-31 03:04+0000\n"
+"Last-Translator: juanda097 <juanda097@openmailbox.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/calibre/calibre-plugins/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -465,7 +466,7 @@ msgstr "Estas configuraciones proporcionan un control más fino sobre qué metad
 
 #: config.py:673
 msgid "personal.ini"
-msgstr ""
+msgstr "personal.ini"
 
 #: config.py:680 config.py:784 config.py:785
 msgid "Edit personal.ini"
@@ -485,11 +486,11 @@ msgstr ""
 msgid ""
 "View your personal.ini with usernames and passwords removed.  For safely "
 "sharing your personal.ini settings with others."
-msgstr ""
+msgstr "Ver sus personal.ini con nombres de usuario y contraseñas eliminadas. Para compartir de forma segura la configuración personal.ini con otros."
 
 #: config.py:704
 msgid "defaults.ini"
-msgstr ""
+msgstr "defaults.ini"
 
 #: config.py:709
 msgid ""

calibre-plugin/translations/fr.po

@@ -4,6 +4,7 @@
 # Translators:
 # Xotes <alois.glibert@gmail.com>, 2015
 # Franck, 2015
+# J M <JimmXinuTwo@xinu.nu>, 2016
 # Ptit Prince <leporello1791@gmail.com>, 2014-2016
 # Piconcely Yoann <yoanncoolazz@gmail.com>, 2015
 # sengian <sengian1@gmail.com>, 2016
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
 "POT-Creation-Date: 2016-04-28 16:06+Central Daylight Time\n"
-"PO-Revision-Date: 2016-04-17 07:52+0000\n"
-"Last-Translator: sengian <sengian1@gmail.com>\n"
+"PO-Revision-Date: 2016-06-01 00:19+0000\n"
+"Last-Translator: J M <JimmXinuTwo@xinu.nu>\n"
 "Language-Team: French (http://www.transifex.com/calibre/calibre-plugins/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -208,7 +209,7 @@ msgid ""
 "%(cmplt)s and %(inprog)s tags will be still be updated, if known.\n"
 "%(lul)s tags will be updated if %(lus)s in %(is)s.\n"
 "(If Tags is set to 'New Only' in the Standard Columns tab, this has no effect.)"
-msgstr "Les étiquettes existantes seront gardées et toutes les nouvelles étiquettes ajoutées.\nLes étiquettes %(cmplt)s et %(inprog) seront quand même mise à jour, si connues.\nLes étiquettes %(lul)s seront mises à jour si %(lus)s dans %(is)s.\n(Si les étiquettes sont définies à 'Nouveau uniquement\" dans l'onglet colonnes standards, ceci n'a pas d'effet.)"
+msgstr "Les étiquettes existantes seront gardées et toutes les nouvelles étiquettes ajoutées.\nLes étiquettes %(cmplt)s et %(inprog)s seront quand même mise à jour, si connues.\nLes étiquettes %(lul)s seront mises à jour si %(lus)s dans %(is)s.\n(Si les étiquettes sont définies à 'Nouveau uniquement\" dans l'onglet colonnes standards, ceci n'a pas d'effet.)"
 
 #: config.py:458
 msgid "Force Author into Author Sort?"

calibre-plugin/translations/nl.po

@@ -2,6 +2,7 @@
 # Copyright (C) YEAR ORGANIZATION
 # 
 # Translators:
+# Alex, 2016
 # Nathan Follens, 2015
 # Rodolfo_Jadon, 2014-2015
 # Volluta <volluta@tutanota.com>, 2015
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
 "POT-Creation-Date: 2016-04-28 16:06+Central Daylight Time\n"
-"PO-Revision-Date: 2016-03-29 09:06+0000\n"
-"Last-Translator: Kovid Goyal <kovid@kovidgoyal.net>\n"
+"PO-Revision-Date: 2016-06-23 02:16+0000\n"
+"Last-Translator: Alex\n"
 "Language-Team: Dutch (http://www.transifex.com/calibre/calibre-plugins/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -959,7 +960,7 @@ msgstr ""
 
 #: config.py:1354
 msgid "Save All Errors"
-msgstr ""
+msgstr "Sla alle fouten op"
 
 #: config.py:1355
 msgid "If unchecked, these errors will not be saved:%s"
@@ -1099,7 +1100,7 @@ msgstr ""
 
 #: config.py:1507
 msgid "Mark Emails Read"
-msgstr ""
+msgstr "Markeer emails gelezen"
 
 #: config.py:1508
 msgid ""
@@ -1336,7 +1337,7 @@ msgstr ""
 
 #: dialogs.py:848
 msgid "Background Metadata?"
-msgstr ""
+msgstr "Achtergrond metadata?"
 
 #: dialogs.py:849
 msgid ""
@@ -1368,11 +1369,11 @@ msgstr ""
 
 #: dialogs.py:1054
 msgid "Are you sure you want to remove this URL from the list?"
-msgstr ""
+msgstr "Weet u zeker dat u deze URL van de lijst wilt verwijderen?"
 
 #: dialogs.py:1056
 msgid "Are you sure you want to remove the %d selected URLs from the list?"
-msgstr ""
+msgstr "Weet u zeker dat u de %d geselecteerde URLs van de lijst wilt verwijderen?"
 
 #: dialogs.py:1074
 msgid "List of Books to Reject"
@@ -1386,7 +1387,7 @@ msgstr ""
 
 #: dialogs.py:1101
 msgid "Remove selected URLs from the list"
-msgstr ""
+msgstr "Verwijder geselecteerde URLs van de lijst"
 
 #: dialogs.py:1116 dialogs.py:1120
 msgid "This will be added to whatever note you've set for each URL above."
@@ -1456,7 +1457,7 @@ msgstr "FanFiction-verhalen downloaden van verschillende websites"
 
 #: fff_plugin.py:293
 msgid "&Download from URLs"
-msgstr ""
+msgstr "&Download van URLs"
 
 #: fff_plugin.py:295
 msgid "Download FanFiction Books from URLs"
@@ -1785,7 +1786,7 @@ msgstr ""
 
 #: fff_plugin.py:1053
 msgid "Cannot update non-epub format."
-msgstr ""
+msgstr "Kan "
 
 #: fff_plugin.py:1128
 msgid "Are You an Adult?"
@@ -2041,7 +2042,7 @@ msgstr ""
 
 #: fff_plugin.py:1820
 msgid "Adding format to book failed for some reason..."
-msgstr ""
+msgstr "Het toevoegen "
 
 #: fff_plugin.py:1823 jobs.py:321
 msgid "Error"
@@ -2117,7 +2118,7 @@ msgstr ""
 
 #: jobs.py:103
 msgid "Download Results:"
-msgstr ""
+msgstr "Downloadresultaten:"
 
 #: jobs.py:105
 msgid "Successful:"
@@ -2133,7 +2134,7 @@ msgstr "Download gestart..."
 
 #: jobs.py:230
 msgid "Download %s completed, %s chapters."
-msgstr ""
+msgstr "Download %s voltooid, %s hoofdstukken."
 
 #: jobs.py:255
 msgid "Already contains %d chapters.  Reuse as is."

calibre-plugin/translations/sv.po

@@ -3,13 +3,14 @@
 # 
 # Translators:
 # Henrik Mattsson-Mårn <h@reglage.net>, 2016
+# J M <JimmXinuTwo@xinu.nu>, 2016
 # Jonatan Nyberg <jonatan@autistici.org>, 2016
 # Merarom <merarom@yahoo.es>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre-plugins\n"
 "POT-Creation-Date: 2016-04-28 16:06+Central Daylight Time\n"
-"PO-Revision-Date: 2016-05-23 16:51+0000\n"
+"PO-Revision-Date: 2016-06-12 18:44+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/calibre/calibre-plugins/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +48,7 @@ msgstr "Inställningar för:"
 
 #: common_utils.py:497
 msgid "Clear"
-msgstr "Ta bort"
+msgstr "Rensa"
 
 #: common_utils.py:499
 msgid "Clear all settings for this plugin"
@@ -153,7 +154,7 @@ msgid ""
 "(title, author, URL, tags, custom columns, etc) from the web site. <br "
 "/>This sets whether that will default to on or off. <br />Columns set to "
 "'New Only' in the column tabs will only be set for new books."
-msgstr ""
+msgstr "Vid varje hämtning, erbjuder FanFicFare en möjlighet att uppdatera calibres metadata (titel, författare, URL, taggar, anpassade kolumner, osv.) från webbsidan. <br />Detta ställer in det som standard till på eller av. <br />Kolumner satt till \"Endast ny\" i kolumnflikarna kommer endast att ställas in för nya böcker."
 
 #: config.py:432
 msgid "Default Update EPUB Cover when Updating EPUB?"
@@ -164,7 +165,7 @@ msgid ""
 "On each download, FanFicFare offers an option to update the book cover image"
 " <i>inside</i> the EPUB from the web site when the EPUB is updated.<br "
 "/>This sets whether that will default to on or off."
-msgstr ""
+msgstr "Vid varje hämtning, erbjuder FanFicFare en möjlighet att uppdatera bokomslagesbilden <i>i</ i> EPUB:en från webbsidan när EPUB uppdateras. <br />Detta ställer in det som standard till på eller av."
 
 #: config.py:437
 msgid "Default Background Metadata?"
@@ -192,7 +193,7 @@ msgstr "Ta bort andra format som finns?"
 msgid ""
 "Check this to automatically delete all other ebook formats when updating an existing book.\n"
 "Handy if you have both a Nook(epub) and Kindle(mobi), for example."
-msgstr ""
+msgstr "Kryssa i det här för att automatiskt ta bort alla andra e-bokformat när du uppdaterar en befintlig bok.\nPraktiskt om du har både en Nook (EPUB) och Kindle (MOBI), till exempel."
 
 #: config.py:453
 msgid "Keep Existing Tags when Updating Metadata?"
@@ -208,7 +209,7 @@ msgstr ""
 
 #: config.py:458
 msgid "Force Author into Author Sort?"
-msgstr ""
+msgstr "Tvingar författare in i författarsortering?"
 
 #: config.py:459
 msgid ""
@@ -340,7 +341,7 @@ msgstr ""
 
 #: config.py:539
 msgid "Keep 'Add New from URL(s)' dialog on top?"
-msgstr ""
+msgstr "Håll 'Lägg till ny från URL'-dialog överst?"
 
 #: config.py:540
 msgid ""
@@ -354,15 +355,15 @@ msgstr "Visa beräknad tid som återstår?"
 
 #: config.py:545
 msgid "When a Progress Bar is shown, show a rough estimate of the time left."
-msgstr ""
+msgstr "När en förloppsmätare visas, visa en grov uppskattning av den tid som återstår."
 
 #: config.py:549
 msgid "Misc Options"
-msgstr ""
+msgstr "Tillbehör och övriga alternativ"
 
 #: config.py:553
 msgid "Inject calibre Series when none found?"
-msgstr ""
+msgstr "Inför calibre serier när ingen finns?"
 
 #: config.py:554
 msgid ""
@@ -383,7 +384,7 @@ msgstr ""
 
 #: config.py:563
 msgid "Reject List"
-msgstr ""
+msgstr "Avvisa lista"
 
 #: config.py:567
 msgid "Edit Reject URL List"
@@ -463,7 +464,7 @@ msgstr ""
 
 #: config.py:673
 msgid "personal.ini"
-msgstr ""
+msgstr "personal.ini"
 
 #: config.py:680 config.py:784 config.py:785
 msgid "Edit personal.ini"
@@ -477,7 +478,7 @@ msgstr ""
 
 #: config.py:693
 msgid "View \"Safe\" personal.ini"
-msgstr ""
+msgstr "Visa \"säker\" personal.ini"
 
 #: config.py:698 config.py:775
 msgid ""
@@ -487,7 +488,7 @@ msgstr ""
 
 #: config.py:704
 msgid "defaults.ini"
-msgstr ""
+msgstr "defaults.ini"
 
 #: config.py:709
 msgid ""
@@ -501,7 +502,7 @@ msgstr "Visa standardvärden"
 
 #: config.py:721
 msgid "Calibre Columns"
-msgstr ""
+msgstr "calibre-kolumner"
 
 #: config.py:728
 msgid ""
@@ -522,7 +523,7 @@ msgstr ""
 
 #: config.py:743
 msgid "Show Calibre Column Names"
-msgstr ""
+msgstr "Visa calibre-kolumn namn"
 
 #: config.py:752
 msgid ""
@@ -531,15 +532,15 @@ msgstr ""
 
 #: config.py:762
 msgid "Plugin Defaults"
-msgstr ""
+msgstr "Tilläggets standardinställningar"
 
 #: config.py:763
 msgid "Plugin Defaults (%s) (Read-Only)"
-msgstr ""
+msgstr "plugin standardinställningar (%s) (skrivskyddad)"
 
 #: config.py:774
 msgid "View 'Safe' personal.ini"
-msgstr ""
+msgstr "Visa 'säker' personal.ini"
 
 #: config.py:808
 msgid "Calibre Column Entry Names"
@@ -637,15 +638,15 @@ msgstr ""
 
 #: config.py:937
 msgid "Generate Calibre Cover:"
-msgstr ""
+msgstr "Generera calibre omslag:"
 
 #: config.py:964
 msgid "Plugin %(gc)s"
-msgstr ""
+msgstr "Tillägg %(gc)s"
 
 #: config.py:965
 msgid "Use plugin to create covers.  Additional settings are below."
-msgstr ""
+msgstr "Använd tillägg för att skapa omslag. Ytterligare inställningar finns nedan."
 
 #: config.py:972
 msgid "Calibre Generate Cover"
@@ -660,7 +661,7 @@ msgstr ""
 
 #: config.py:987
 msgid "Generate Covers Only for New Books"
-msgstr ""
+msgstr "Skapa omslag endast för nya böcker"
 
 #: config.py:988
 msgid ""
@@ -681,7 +682,7 @@ msgstr ""
 
 #: config.py:1001
 msgid "%(gc)s(Plugin) Settings"
-msgstr ""
+msgstr "%(gc)s(Plugin) Inställningar"
 
 #: config.py:1009
 msgid ""
@@ -731,7 +732,7 @@ msgstr ""
 
 #: config.py:1108
 msgid "Which column and algorithm to use are configured in %(cp)s."
-msgstr ""
+msgstr "Vilken kolumn och algoritm att använda är konfigurerade i%(cp)s."
 
 #: config.py:1118
 msgid ""
@@ -803,11 +804,11 @@ msgstr "Status"
 
 #: config.py:1239
 msgid "Status:%(cmplt)s"
-msgstr "Status:%(cmplt)"
+msgstr "Status:%(cmplt)s"
 
 #: config.py:1240
 msgid "Status:%(inprog)s"
-msgstr ""
+msgstr "Status:%(inprog)s"
 
 #: config.py:1241 config.py:1403
 msgid "Series"
@@ -911,7 +912,7 @@ msgstr ""
 
 #: config.py:1303
 msgid "Update this %s column(%s) with..."
-msgstr ""
+msgstr "Uppdatera denna %s kolumn(%s) med..."
 
 #: config.py:1313
 msgid "Values that aren't valid for this enumeration column will be ignored."
@@ -944,7 +945,7 @@ msgstr ""
 
 #: config.py:1335
 msgid "Special column:"
-msgstr ""
+msgstr "Special kolumn:"
 
 #: config.py:1340
 msgid "Update/Overwrite Error Column:"
@@ -958,7 +959,7 @@ msgstr ""
 
 #: config.py:1354
 msgid "Save All Errors"
-msgstr ""
+msgstr "Spara alla fel"
 
 #: config.py:1355
 msgid "If unchecked, these errors will not be saved:%s"
@@ -1050,7 +1051,7 @@ msgstr ""
 
 #: config.py:1460
 msgid "IMAP Server Name"
-msgstr ""
+msgstr "IMAP-servernamn"
 
 #: config.py:1461
 msgid "Name of IMAP server--must allow IMAP4 with SSL.  Eg: imap.gmail.com"
@@ -1058,7 +1059,7 @@ msgstr ""
 
 #: config.py:1470
 msgid "IMAP User Name"
-msgstr ""
+msgstr "IMAP-användarnamn"
 
 #: config.py:1471
 msgid ""
@@ -1068,7 +1069,7 @@ msgstr ""
 
 #: config.py:1480
 msgid "IMAP User Password"
-msgstr ""
+msgstr "IMAP-användarlösenord"
 
 #: config.py:1481
 msgid ""
@@ -1142,7 +1143,7 @@ msgstr "Visa nedladdningsalternativ"
 
 #: dialogs.py:264 dialogs.py:810
 msgid "Output &Format:"
-msgstr ""
+msgstr "Utdata &format:"
 
 #: dialogs.py:272 dialogs.py:818
 msgid ""
@@ -1151,7 +1152,7 @@ msgstr "Välj utdataformat att skapa. Kan fastställa standard från plugin konf
 
 #: dialogs.py:300 dialogs.py:838
 msgid "Update Calibre &Metadata?"
-msgstr ""
+msgstr "Uppdatera calibre &metadata?"
 
 #: dialogs.py:301 dialogs.py:839
 msgid ""
@@ -1212,7 +1213,7 @@ msgstr ""
 
 #: dialogs.py:505
 msgid "For Individual Books"
-msgstr ""
+msgstr "För individuella böcker"
 
 #: dialogs.py:506
 msgid "Get URLs and go to dialog for individual story downloads."
@@ -1270,7 +1271,7 @@ msgstr ""
 
 #: dialogs.py:590 dialogs.py:614 fff_plugin.py:960
 msgid "Fetched metadata for"
-msgstr ""
+msgstr "Hämtade metadata för"
 
 #: dialogs.py:643
 msgid " - %s estimated until done"
@@ -1359,7 +1360,7 @@ msgstr "Är du säker du vill ta bort valda %d böcker från listan?"
 
 #: dialogs.py:1006
 msgid "Note"
-msgstr ""
+msgstr "Anteckning"
 
 #: dialogs.py:1045
 msgid "Select or Edit Reject Note."
@@ -1511,7 +1512,7 @@ msgstr ""
 
 #: fff_plugin.py:338
 msgid "Add to \"Send to Device\" Lists"
-msgstr ""
+msgstr "Lägg till \"Skicka till enhet\"-listor"
 
 #: fff_plugin.py:340
 msgid "Mark Unread: Add to \"To Read\" Lists"
@@ -1527,15 +1528,15 @@ msgstr ""
 
 #: fff_plugin.py:367
 msgid "Reject Selected Books"
-msgstr ""
+msgstr "Avvisa markerade böcker"
 
 #: fff_plugin.py:375
 msgid "&Configure FanFicFare"
-msgstr ""
+msgstr "&Anpassa FanFicFare"
 
 #: fff_plugin.py:378
 msgid "Configure FanFicFare"
-msgstr ""
+msgstr "Anpassa FanFicFare"
 
 #: fff_plugin.py:433
 msgid "Cannot Update Reading Lists from Device View"
@@ -1852,7 +1853,7 @@ msgstr ""
 
 #: fff_plugin.py:1274
 msgid "In library: <a href=\"%(liburl)s\">%(liburl)s</a>"
-msgstr ""
+msgstr "I bibliotek: <a href=\"%(liburl)s\">%(liburl)s</a>"
 
 #: fff_plugin.py:1275 fff_plugin.py:1289
 msgid "New URL: <a href=\"%(newurl)s\">%(newurl)s</a>"
@@ -1888,7 +1889,7 @@ msgstr ""
 
 #: fff_plugin.py:1291
 msgid "Click '<b>No</b>' to skip URL."
-msgstr ""
+msgstr "Klicka '<b>Nej</b>' för att hoppa över URL."
 
 #: fff_plugin.py:1297
 msgid "Update declined by user due to differing story URL(%s)"

fanficfare/adapters/adapter_fictionmaniatv.py

@@ -117,7 +117,7 @@ class FictionManiaTVAdapter(BaseSiteAdapter):
                 self.story.setMetadata('rating', value)
 
             elif key == 'Complete':
-                self.story.setMetadata('status', 'Complete' if value == 'Complete' else 'In-Progress')
+                self.story.setMetadata('status', 'Completed' if value == 'Complete' else 'In-Progress')
 
             elif key == 'Categories':
                 for element in cells[1]('a'):

fanficfare/adapters/adapter_ficwadcom.py

@@ -93,7 +93,7 @@ class FicwadComSiteAdapter(BaseSiteAdapter):
         try:
             data = self._fetchUrl(url)
             # non-existent/removed story urls get thrown to the front page.
-            if "<h2>Welcome to FicWad</h2>" in data:
+            if "<h4>Featured Story</h4>" in data:
                 raise exceptions.StoryDoesNotExist(self.url)
             soup = self.make_soup(data)
         except urllib2.HTTPError, e:

fanficfare/adapters/adapter_harrypotterfanfictioncom.py

@@ -188,9 +188,13 @@ class HarryPotterFanFictionComSiteAdapter(BaseSiteAdapter):
 
         data = self._fetchUrl(url)
 
-        # remove everything after here--the site's chapters break the
-        # BS4 parser.
-        data = data[:data.index('<script type="text/javascript" src="reviewjs.js">')]
+        try:
+            # remove everything after here--the site's chapters break
+            # the BS4 parser.
+            data = data[:data.index('<script type="text/javascript" src="reviewjs.js">')]
+        except:
+            # some older stories don't have the code at the end that breaks things.
+            pass
         
         soup = self.make_soup(data)
 

fanficfare/adapters/adapter_storiesonlinenet.py

@@ -97,7 +97,7 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter):
         params['page'] = 'http://'+self.getSiteDomain()+'/'
         params['submit'] = 'Login'
 
-        loginUrl = 'https://' + self.getSiteDomain() + '/login.php'
+        loginUrl = 'https://' + self.getSiteDomain() + '/sol-secure/login.php'
         logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl,
                                                               params['theusername']))
 

fanficfare/adapters/base_xenforoforum_adapter.py

@@ -228,11 +228,15 @@ class BaseXenForoForumAdapter(BaseSiteAdapter):
 
                 if ( url.startswith(self.getURLPrefix()) or
                      url.startswith('http://'+self.getSiteDomain()) or
-                     url.startswith('https://'+self.getSiteDomain()) ) and ('/posts/' in url or '/threads/' in url):
+                     url.startswith('https://'+self.getSiteDomain()) ) and \
+                     ( '/posts/' in url or '/threads/' in url or 'showpost.php' in url):
 
                     # brute force way to deal with SB's http->https change when hardcoded http urls.
                     url = url.replace('http://'+self.getSiteDomain(),self.getURLPrefix())
 
+                    # http://forums.spacebattles.com/showpost.php?p=4755532&postcount=9
+                    url = re.sub(r'showpost\.php\?p=([0-9]+)(&postcount=[0-9]+)?',r'/posts/\1/',url)
+
                     url = re.sub(r'(^[\'"]+|[\'"]+$)','',url) # strip leading or trailing '" from incorrect quoting.
                     url = re.sub(r'like$','',url) # strip 'like' if incorrect 'like' link instead of proper post URL.
 

fanficfare/story.py

@@ -1069,6 +1069,9 @@ class Story(Configurable):
         if imgurl not in self.imgurls:
 
             try:
+                if imgurl == 'failedtoload':
+                    raise Exception("Previously failed to load")
+
                 parsedUrl = urlparse.urlparse(imgurl)
                 if self.getConfig('no_image_processing'):
                     (data,ext,mime) = no_convert_image(imgurl,

setup.py

@@ -23,7 +23,7 @@ setup(
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version="2.3.3",
+    version="2.3.4",
 
     description='A tool for downloading fanfiction to eBook formats',
     long_description=long_description,

webservice/app.yaml

@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanficfare
 application: fanficfare
-version: 2-3-03
+version: 2-3-04
 runtime: python27
 api_version: 1
 threadsafe: true

webservice/index.html

@@ -35,7 +35,7 @@
 	    If you have any problems with this application, please
 	    report them in
 	    the <a href="http://groups.google.com/group/fanfic-downloader">FanFicFare Google Group</a>.  The
-	    <a href="http://2-3-02.fanficfare.appspot.com">previous version
+	    <a href="http://2-3-03.fanficfare.appspot.com">previous version
 	    </a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>