diff --git a/app.yaml b/app.yaml index 5a7ee1ff..cedb49de 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1,6 @@ # ffd-retief-hrd fanfictiondownloader application: fanfictiondownloader -version: 4-4-14 +version: 4-4-15 runtime: python27 api_version: 1 threadsafe: true diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index bd15c23f..36859f56 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, 5, 28) + version = (1, 5, 29) minimum_calibre_version = (0, 8, 30) #: This field defines the GUI plugin class that contains all the code diff --git a/defaults.ini b/defaults.ini index 6580b95a..01f02761 100644 --- a/defaults.ini +++ b/defaults.ini @@ -412,6 +412,8 @@ cover_exclusion_regexp:/images/.*?ribbon.gif #username:YourName #password:yourpassword +[onedirectionfanfiction.com] + [thehexfiles.net] [thequidditchpitch.org] @@ -538,6 +540,8 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png [www.potionsandsnitches.net] +[www.prisonbreakfic.net] + [www.siye.co.uk] [www.squidge.org/peja] @@ -551,6 +555,8 @@ titlepage_entries: series,category,genre,language,characters,status,datePublishe # Remove numWords -- www.squidge.org/peja word counts are inaccurate titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description +[www.storiesofarda.com] + [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 diff --git a/fanficdownloader/adapters/__init__.py b/fanficdownloader/adapters/__init__.py index 49acc31b..020ce829 100644 --- a/fanficdownloader/adapters/__init__.py +++ b/fanficdownloader/adapters/__init__.py @@ -67,6 +67,9 @@ import adapter_ashwindersycophanthexcom import adapter_thehexfilesnet import adapter_dokugacom import adapter_iketernalnet +import adapter_onedirectionfanfictioncom +import adapter_prisonbreakficnet +import adapter_storiesofardacom ## 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_onedirectionfanfictioncom.py b/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py index 744339d5..3d9afff5 100644 --- a/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py +++ b/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py @@ -69,11 +69,15 @@ class OneDirectionFanfictionComAdapter(BaseSiteAdapter): # The site domain. Does have www here, if it uses it. return 'onedirectionfanfiction.com' + @classmethod + def getAcceptDomains(cls): + return ['www.onedirectionfanfiction.com','onedirectionfanfiction.com'] + def getSiteExampleURLs(self): return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): - return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" + return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" ## Getting the chapter list and the meta data, plus 'is adult' checking. def extractChapterUrlsAndMetadata(self): diff --git a/index.html b/index.html index cc9a3cdf..c3ce58da 100644 --- a/index.html +++ b/index.html @@ -54,17 +54,9 @@ much easier.

-

fanfiction.net fixed

-

- I hope. I'm parsing it a different way now that I hope will work in all cases. Story text should be fine, but keep an eye on the metadata. -

New Sites

- New sites www.dokuga.com, www.ik-eternal.net added. Thanks, Ida. -

-

New Option

-

- New configuration option under [txt], wrap_width. Use to control or disable word wrap in text mode. + New sites onedirectionfanfiction.com, www.prisonbreakfic.net and www.storiesofarda.com added. Thanks, Ida.

Questions? Check out our @@ -74,7 +66,7 @@ If you have any problems with this application, please report them in the FanFictionDownLoader Google Group. The - Previous Version is also available for you to use if necessary. + Previous Version is also available for you to use if necessary.

{{ error_message }} @@ -377,6 +369,21 @@ Use the URL of the story's chapter list, such as
http://www.ik-eternal.net/viewstory.php?sid=1234 +
onedirectionfanfiction.com
+
+ Use the URL of the story's first chapter, such as +
http://onedirectionfanfiction.com/viewstory.php?sid=1234 +
+
www.prisonbreakfic.net
+
+ Use the URL of the story's first chapter, such as +
http://www.prisonbreakfic.net/viewstory.php?sid=1234 +
+
www.storiesofarda.com
+
+ Use the URL of the story's chapter list, such as +
http://www.storiesofarda.com/chapterlistview.asp?SID=7000 +

A few additional things to know, which will make your life substantially easier: diff --git a/plugin-defaults.ini b/plugin-defaults.ini index af668292..938a9988 100644 --- a/plugin-defaults.ini +++ b/plugin-defaults.ini @@ -398,6 +398,8 @@ cover_exclusion_regexp:/images/.*?ribbon.gif #username:YourName #password:yourpassword +[onedirectionfanfiction.com] + [thehexfiles.net] [thequidditchpitch.org] @@ -521,6 +523,8 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png [www.potionsandsnitches.net] +[www.prisonbreakfic.net] + [www.siye.co.uk] [www.squidge.org/peja] @@ -534,6 +538,8 @@ titlepage_entries: series,category,genre,language,characters,status,datePublishe # Remove numWords -- www.squidge.org/peja word counts are inaccurate titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description +[www.storiesofarda.com] + [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