From 951fd68ce6ae21c0e00415f01d52c8f9365f796c Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 13 Aug 2014 13:19:36 -0500 Subject: [PATCH] Fix for AO3 authors all coming out as Anonymous. Bump versions. --- app.yaml | 2 +- calibre-plugin/__init__.py | 2 +- fanficdownloader/adapters/adapter_archiveofourownorg.py | 4 ++-- index.html | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app.yaml b/app.yaml index 93deb25..bfea117 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1,6 @@ # ffd-retief-hrd fanfictiondownloader application: fanfictiondownloader -version: 2-0-01 +version: 2-0-02 runtime: python27 api_version: 1 threadsafe: true diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index ad1f324..7f6f3a3 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -42,7 +42,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase): description = _('UI plugin to download FanFiction stories from various sites.') supported_platforms = ['windows', 'osx', 'linux'] author = 'Jim Miller' - version = (2, 0, 1) + version = (2, 0, 2) minimum_calibre_version = (1, 13, 0) #: This field defines the GUI plugin class that contains all the code diff --git a/fanficdownloader/adapters/adapter_archiveofourownorg.py b/fanficdownloader/adapters/adapter_archiveofourownorg.py index f377cba..705ca3a 100644 --- a/fanficdownloader/adapters/adapter_archiveofourownorg.py +++ b/fanficdownloader/adapters/adapter_archiveofourownorg.py @@ -165,11 +165,11 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter): # Now go hunting for all the meta data and the chapter list. ## Title - a = soup.find('a', href=re.compile(r"^/works/\d+$")) + a = soup.find('a', href=re.compile(r"/works/\d+$")) self.story.setMetadata('title',stripHTML(a)) # Find authorid and URL from... author url. - alist = soup.findAll('a', href=re.compile(r"^/users/\w+/pseuds/\w+")) + alist = soup.findAll('a', href=re.compile(r"/users/\w+/pseuds/\w+")) if len(alist) < 1: # ao3 allows for author 'Anonymous' with no author link. self.story.setMetadata('author','Anonymous') self.story.setMetadata('authorUrl','http://archiveofourown.org/') diff --git a/index.html b/index.html index 67e5e09..404c655 100644 --- a/index.html +++ b/index.html @@ -60,10 +60,7 @@

@@ -76,7 +73,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.

{{ error_message }}