Integrate new adapters, bump versions.

This commit is contained in:
Jim Miller 2012-07-08 21:53:27 -05:00
parent b408cef83f
commit 27fca9eb05
6 changed files with 76 additions and 19 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -57,24 +57,9 @@
<h3>New Sites</h3>
<p>
New sites ncisfic.com and national-library.net added.
New sites dark-solace.org, pretendercentre.com and themasque.net added.
<br />Thanks, Ida!
</p>
<h3>New Fixes</h3>
<p>
Fixes to support www.fanfiktion.de and archiveofourown.org username and password.
</p>
<p>
<b>Note:</b> 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.
</p>
<p>
Questions? Check out our
@ -84,7 +69,7 @@
If you have any problems with this application, please
report them in
the <a href="http://groups.google.com/group/fanfic-downloader">FanFictionDownLoader Google Group</a>. The
<a href="http://4-4-17.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
<a href="http://4-4-18.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
</p>
<div id='error'>
{{ error_message }}
@ -465,6 +450,21 @@
Use the URL of the story's first chapter, such as
<br /><a href="http://national-library.net/viewstory.php?storyid=1234">http://national-library.net/viewstory.php?storyid=1234</a>
</dd>
<dt>dark-solace.org</dt>
<dd>
Use the URL of the story's first chapter, such as
<br /><a href="http://dark-solace.org/elysian/viewstory.php?sid=1234">http://dark-solace.org/elysian/viewstory.php?sid=1234</a>
</dd>
<dt>pretendercentre.com</dt>
<dd>
Use the URL of the story's first chapter, such as
<br /><a href="http://pretendercentre.com/missingpieces/viewstory.php?sid=1234">http://pretendercentre.com/missingpieces/viewstory.php?sid=1234</a>
</dd>
<dt>themasque.net</dt>
<dd>
Use the URL of the story's first chapter, such as
<br /><a href="http://themasque.net/wiktt/efiction/viewstory.php?sid=1234">http://themasque.net/wiktt/efiction/viewstory.php?sid=1234</a>
</dd>
</dl>
<p>
A few additional things to know, which will make your life substantially easier:

View file

@ -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