diff --git a/app.yaml b/app.yaml index 7650006..cbdb1c6 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1,6 @@ # ffd-retief-hrd fanfictiondownloader application: fanfictiondownloader -version: 4-4-18 +version: 4-4-19 runtime: python27 api_version: 1 threadsafe: true diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index e12608d..1a67677 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, 42) + version = (1, 5, 43) 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 07c5873..d17c863 100644 --- a/defaults.ini +++ b/defaults.ini @@ -357,6 +357,14 @@ extratags: FanFiction,Testing,HTML ## cover image. This lets you exclude them. cover_exclusion_regexp:/images/.*?ribbon.gif +[dark-solace.org] +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + [dramione.org] ## Some sites require login (or login for some rated stories) The ## program can prompt you, or you can save it in config. In @@ -450,6 +458,12 @@ cover_exclusion_regexp:/images/.*?ribbon.gif ## this should go in your personal.ini, not defaults.ini. #is_adult:true +[pretendercentre.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + [samdean.archive.nu] [sg1-heliopolis.com] @@ -462,6 +476,19 @@ cover_exclusion_regexp:/images/.*?ribbon.gif [thehexfiles.net] +[themasque.net] +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + +## Some sites also require the user to confirm they are adult for +## adult content. In commandline version, this should go in your +## personal.ini, not defaults.ini. +#is_adult:true + [thequidditchpitch.org] ## 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 8ed2e6e..eb59e9d 100644 --- a/fanficdownloader/adapters/__init__.py +++ b/fanficdownloader/adapters/__init__.py @@ -81,6 +81,9 @@ import adapter_ponyfictionarchivenet import adapter_sg1heliopoliscom import adapter_ncisficcom import adapter_nationallibrarynet +import adapter_themasquenet +import adapter_pretendercentrecom +import adapter_darksolaceorg ## 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/index.html b/index.html index e77a09e..4ad5794 100644 --- a/index.html +++ b/index.html @@ -57,24 +57,9 @@
- New sites ncisfic.com and national-library.net added.
+ New sites dark-solace.org, pretendercentre.com and themasque.net added.
Thanks, Ida!
-
- - Fixes to support www.fanfiktion.de and archiveofourown.org username and password. - -
-- - Note: As part of the archiveofourown.org fix, the - configuration section for AO3 is now - [archiveofourown.org], not [www.archiveofourown.org]. - Please change your personal configuration accordingly, if - you have customized your settings for archiveofourown.org. -
Questions? Check out our @@ -84,7 +69,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.
A few additional things to know, which will make your life substantially easier: diff --git a/plugin-defaults.ini b/plugin-defaults.ini index 6b3678b..65bfc80 100644 --- a/plugin-defaults.ini +++ b/plugin-defaults.ini @@ -343,6 +343,14 @@ extratags: FanFiction,Testing,HTML ## cover image. This lets you exclude them. cover_exclusion_regexp:/images/.*?ribbon.gif +[dark-solace.org] +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + [dramione.org] ## Some sites require login (or login for some rated stories) The ## program can prompt you, or you can save it in config. In @@ -436,6 +444,12 @@ cover_exclusion_regexp:/images/.*?ribbon.gif ## this should go in your personal.ini, not defaults.ini. #is_adult:true +[pretendercentre.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + [samdean.archive.nu] [sg1-heliopolis.com] @@ -448,6 +462,19 @@ cover_exclusion_regexp:/images/.*?ribbon.gif [thehexfiles.net] +[themasque.net] +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + +## Some sites also require the user to confirm they are adult for +## adult content. In commandline version, this should go in your +## personal.ini, not defaults.ini. +#is_adult:true + [thequidditchpitch.org] ## Some sites require login (or login for some rated stories) The ## program can prompt you, or you can save it in config. In