diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 36ea376b..b4442ae1 100644 --- a/calibre-plugin/__init__.py +++ b/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, 4, 2) + version = (1, 4, 3) minimum_calibre_version = (0, 8, 30) #: This field defines the GUI plugin class that contains all the code diff --git a/fanficdownloader/adapters/__init__.py b/fanficdownloader/adapters/__init__.py index abb77ab4..6b841870 100644 --- a/fanficdownloader/adapters/__init__.py +++ b/fanficdownloader/adapters/__init__.py @@ -44,6 +44,7 @@ import adapter_twiwritenet import adapter_whoficcom import adapter_siyecouk import adapter_archiveofourownorg +import adapter_ficbooknet ## This bit of complexity allows adapters to be added by just adding ## importing. It eliminates the long if/else clauses we used to need diff --git a/fanficdownloader/adapters/adapter_ficbooknet.py b/fanficdownloader/adapters/adapter_ficbooknet.py index 852a8def..c9a98bc7 100644 --- a/fanficdownloader/adapters/adapter_ficbooknet.py +++ b/fanficdownloader/adapters/adapter_ficbooknet.py @@ -70,7 +70,7 @@ class FicBookNetAdapter(BaseSiteAdapter): return "http://"+self.getSiteDomain()+"/readfic/12345" def getSiteURLPattern(self): - return re.escape("http://"+self.getSiteDomain()+"/readfic/")+r"\d+$" + return re.escape("http://"+self.getSiteDomain()+"/readfic/")+r"\d+" ## Getting the chapter list and the meta data, plus 'is adult' checking. def extractChapterUrlsAndMetadata(self): @@ -218,4 +218,4 @@ class FicBookNetAdapter(BaseSiteAdapter): if None == chapter: raise exceptions.FailedToDownload("Error downloading Chapter: %s! Missing required element!" % url) - return utf8FromSoup(chapter) \ No newline at end of file + return utf8FromSoup(chapter) diff --git a/index.html b/index.html index 28a3b515..735472a3 100644 --- a/index.html +++ b/index.html @@ -54,11 +54,18 @@ much easier.
-+ Thanks to Ida Leter's hard work, we now support ficbook.net, a Russian language fanfiction site. +
++ There's now a 'Language' metadata field that can be filled, if the site supports different languages. Currently, it's only used + with fanfiction.net and ficbook.net. +
The CSS included in the HTML and EPUB output formats is now a customizable parameter.
-There's now a customizable parameter to include a list of regular expressions to replace metadata as you see fit.
@@ -240,9 +247,16 @@+ A few additional things to know, which will make your life substantially easier: +