From df09eadf81c67cd63ae564f505a0fe82a9c80d0d Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 4 Mar 2013 12:02:32 -0600 Subject: [PATCH] Fix login failure for tth, add anthology=true metadata, bump version. --- calibre-plugin/__init__.py | 2 +- calibre-plugin/ffdl_plugin.py | 1 + calibre-plugin/ffdl_util.py | 4 ++-- fanficdownloader/adapters/adapter_tthfanficorg.py | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index f52be840..51da39f8 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, 7, 11) + version = (1, 7, 12) minimum_calibre_version = (0, 8, 57) #: This field defines the GUI plugin class that contains all the code diff --git a/calibre-plugin/ffdl_plugin.py b/calibre-plugin/ffdl_plugin.py index c0640389..df4afb47 100644 --- a/calibre-plugin/ffdl_plugin.py +++ b/calibre-plugin/ffdl_plugin.py @@ -1703,6 +1703,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction): if v in book['tags']: book['tags'].remove(v) book['tags'].append('Anthology') + book['all_metadata']['anthology'] = "true" return book def split_text_to_urls(urls): diff --git a/calibre-plugin/ffdl_util.py b/calibre-plugin/ffdl_util.py index 1527e15f..adaef1ea 100644 --- a/calibre-plugin/ffdl_util.py +++ b/calibre-plugin/ffdl_util.py @@ -24,7 +24,7 @@ make_firstimage_cover:true else: return prefs['personal.ini'] -def get_ffdl_config(url,fileform="EPUB",personalini=None): +def get_ffdl_config(url,fileform="epub",personalini=None): if not personalini: personalini = get_ffdl_personalini() site='unknown' @@ -38,6 +38,6 @@ def get_ffdl_config(url,fileform="EPUB",personalini=None): return configuration -def get_ffdl_adapter(url,fileform="EPUB",personalini=None): +def get_ffdl_adapter(url,fileform="epub",personalini=None): return adapters.getAdapter(get_ffdl_config(url,fileform,personalini),url) diff --git a/fanficdownloader/adapters/adapter_tthfanficorg.py b/fanficdownloader/adapters/adapter_tthfanficorg.py index 8f40568a..3f83bd4f 100644 --- a/fanficdownloader/adapters/adapter_tthfanficorg.py +++ b/fanficdownloader/adapters/adapter_tthfanficorg.py @@ -100,8 +100,8 @@ class TwistingTheHellmouthSiteAdapter(BaseSiteAdapter): if "Stories Published" not in d : #Member Account logger.info("Failed to login to URL %s as %s" % (loginUrl, - params['penname'])) - raise exceptions.FailedToLogin(url,params['penname']) + params['urealname'])) + raise exceptions.FailedToLogin(self.url,params['urealname']) return False else: return True