diff --git a/fanficdownloader/fictionalley.py b/fanficdownloader/fictionalley.py index 332a08af..68cd36e4 100644 --- a/fanficdownloader/fictionalley.py +++ b/fanficdownloader/fictionalley.py @@ -249,7 +249,7 @@ class FictionAlley(FanfictionSiteAdapter): logging.debug('li chapterlink not found! li=%s' % li) - print('Story "%s" by %s' % (self.storyName, self.authorName)) + logging.debug('Story "%s" by %s' % (self.storyName, self.authorName)) return result diff --git a/fanficdownloader/ficwad.py b/fanficdownloader/ficwad.py index 13e7a45d..058528bc 100644 --- a/fanficdownloader/ficwad.py +++ b/fanficdownloader/ficwad.py @@ -170,7 +170,7 @@ class FicWad(FanfictionSiteAdapter): logging.debug('self.numWords=%s' % self.numWords) - print('Story "%s" by %s' % (self.storyName, self.authorName)) + logging.debug('Story "%s" by %s' % (self.storyName, self.authorName)) result = [] ii = 1 diff --git a/index.html b/index.html index 4987804d..f5736129 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Fanfiction Downloader — twilighted.net, fanfiction.net, fictionpress.com, fictionalley.org, ficwad.com, potionsandsnitches.net, harrypotterfanfiction.com to epub and HTML to Stanza, Kindle, Nook, Sony Reader + Fanfiction Downloader — twilighted.net, fanfiction.net, fictionpress.com, fictionalley.org, ficwad.com, potionsandsnitches.net, harrypotterfanfiction.com, mediaminer.org to epub and HTML to Stanza, Kindle, Nook, Sony Reader @@ -33,23 +33,11 @@
- Hi, {{ nickname }}! This is a fan fiction downloader, which makes reading stories from various websites - much easier. -
    -
  • - For fictionalley.org, please paste the URL of the story's chapter list in the box, such as - this. Or the story text URL for - fictionalley.org one-shots, such - as this. -
    • -
  • - For all other supported sites, please paste the URL of the first chapter in the box. For - one-shots, the first chapter is the whole story. -
    • -
  • - Alternatively, see your personal list of previously downloaded fanfics. -
    • -
+

Hi, {{ nickname }}! This is a fan fiction downloader, which makes reading stories from various websites + much easier.

+

To support new features, such as including story summaries, + the URL you need to use for some sites has changed. See below for example URLs for each site.

+

Or see your personal list of previously downloaded fanfics.

{{ error_message }} @@ -66,23 +54,24 @@
-

Login and Password

-
- - If the story requires a login and password to download (e.g. marked as Mature on FFA), you may need to provide - your credentials to download it, otherwise just leave it empty -
-
-
Login
-
-
- -
-
Password
-
-
+

Login and Password

+
+ + If the story requires a login and password to download (e.g. marked as Mature on FFA), you may need to provide + your credentials to download it, otherwise just leave it empty +
+
+
Login
+
+
+ +
+
Password
+
+
+
@@ -100,7 +89,41 @@ {% endif %}
- Few things to know, which will make your life substantially easier: +
+
fictionalley.org +
Use the URL of the story's chapter list, such as +
http://www.fictionalley.org/authors/drt/DA.html. Or the story text URL for + fictionalley.org one-shots, such as +
http://www.fictionalley.org/authors/drt/JOTP01a.html. +
fanfiction.net +
Use the URL of any story chapter, with or without story title such as +
http://www.fanfiction.net/s/5192986/1/A_Fox_in_Tokyo or +
http://www.fanfiction.net/s/5192986/5/. +
fictionpress.com +
Use the URL of any story chapter, such as +
http://www.fictionpress.com/s/2851771/1/Untouchable_Love or +
http://www.fictionpress.com/s/2847338/6/. +
twilighted.net +
Use the URL of the start of the story, such as +
http://twilighted.net/viewstory.php?sid=8422. +
ficwad.com +
Use the URL of any story chapter, such as +
http://www.ficwad.com/story/75246. +
harrypotterfanfiction.com +
Use the URL of the story's chapter list, such as +
http://www.harrypotterfanfiction.com/viewstory.php?psid=289208. +
potionsandsnitches.net +
Use the URL of the story's chapter list, such as +
http://potionsandsnitches.net/fanfiction/viewstory.php?sid=2332. +
mediaminer.org +
Use the URL of the story's chapter list, such as +
http://www.mediaminer.org/fanfic/view_st.php/166653. + Or the story URL for one-shots, such as +
http://www.mediaminer.org/fanfic/view_st.php/167618. +
+ + + A few additional things to know, which will make your life substantially easier:
  1. First thing to know: I do not use your login and password. In fact, all I know about it is your ID – password @@ -111,20 +134,12 @@ — how to read fiction in Stanza or any other ebook reader.
  2. - Currently we support fanfiction.net, fictionpress.com, ficwad.com, fictionalley.org, harrypotterfanfiction.com, potionsandsnitches.net, and twilighted.net. - (fanficauthors.net withdrawn as they offer native ePub functionality now.) + Currently we support fanfiction.net, fictionpress.com, ficwad.com, fictionalley.org, harrypotterfanfiction.com, potionsandsnitches.net, mediaminer.org and twilighted.net. + fanficauthors.net and tthfanfic.org offer native ePub functionality.
  3. You can download fanfiction directly from your iPhone, Kindle or (possibly) other ebook reader.
    4. -
  4. - Paste a URL of the first chapter of the fanfic, not the index page, except for fictionalley.org. -
    5. -
  5. - For fictionalley.org, you need to use the URL of the story's chapter list, such as - this. Or the story text URL for fictionalley.org - one-shots, such as this. -
  6. One-shots, fics with a single chapter, are now supported.
    7. diff --git a/main.py b/main.py index 1ca7dcb2..1ae0ac99 100644 --- a/main.py +++ b/main.py @@ -184,12 +184,18 @@ class FanfictionDownloader(webapp.RequestHandler): adapter = fictionalley.FictionAlley(url) elif url.find('ficwad') != -1: adapter = ficwad.FicWad(url) - elif url.find('fanfiction.net') != -1 or url.find('fictionpress.com') != -1: + elif url.find('fanfiction.net') != -1: adapter = ffnet.FFNet(url) + elif url.find('fictionpress.com') != -1: + adapter = fpcom.FPCom(url) elif url.find('harrypotterfanfiction.com') != -1: adapter = hpfiction.HPFiction(url) - elif url.find('twilighted') != -1 or url.find('potionsandsnitches.net') != -1: + elif url.find('twilighted.net') != -1: adapter = twilighted.Twilighted(url) + elif url.find('potionsandsnitches.net') != -1: + adapter = potionsNsnitches.PotionsNSnitches(url) + elif url.find('mediaminer.org') != -1: + adapter = mediaminer.MediaMiner(url) else: logging.debug("Bad URL detected") self.redirect('/?error=bad_url&url=' + urlEscape(url) )