diff --git a/app.yaml b/app.yaml index 4d4afcd7..4609501c 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1,6 @@ # ffd-retief-hrd fanfictiondownloader application: fanfictiondownloader -version: 4-4-79 +version: 4-4-80 runtime: python27 api_version: 1 threadsafe: true diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 2ca8c9e3..cc43a768 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -36,7 +36,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase): description = 'UI plugin to download FanFiction stories from various sites.' supported_platforms = ['windows', 'osx', 'linux'] author = 'Jim Miller' - version = (1, 7, 50) + version = (1, 7, 51) minimum_calibre_version = (0, 8, 57) #: This field defines the GUI plugin class that contains all the code diff --git a/defaults.ini b/defaults.ini index f0c8ac5a..f3b17934 100644 --- a/defaults.ini +++ b/defaults.ini @@ -220,6 +220,11 @@ extratags: FanFiction ## doesn't work on some devices either.) #replace_hr: false +## Some sites/authors/stories use br tags instead of p tags for +## paragraphs. This feature uses some heuristics to find and replace +## br paragraphs with p tags while preserving scene breaks. +#replace_br_with_p: false + ## If set false, the summary will have all html stripped. ## Both this and include_images must be true to get images in the ## summary. diff --git a/fanficdownloader/htmlheuristics.py b/fanficdownloader/htmlheuristics.py index 0d89c4e0..44c68fa2 100644 --- a/fanficdownloader/htmlheuristics.py +++ b/fanficdownloader/htmlheuristics.py @@ -23,10 +23,6 @@ from . import exceptions as exceptions def replace_br_with_p(body): - logger.debug('Body Length.: %d' % len(body)) - logger.debug('Body First >: %d' % body.find('>')) - logger.debug('Body Last <.: %d' % body.rfind("<")) - # Ascii character (and Unicode as well) xA0 is a non-breaking space, ascii code 160. # However, Python Regex does not recognize it as a whitespace, so we'll be changing it to a reagular space. body = body.replace(u'\xa0', u' ') diff --git a/index.html b/index.html index faeacc52..6bc27a85 100644 --- a/index.html +++ b/index.html @@ -46,6 +46,14 @@ {{yourfile}} +
+ Fanfiction.net appears to be blocking access from Google + App Engine, which prevents this web service. There's + nothing I can do about it. At the time of writing, the + latest CLI and calibre plugin versions worked. +
+ {% if authorized %}