diff --git a/app.yaml b/app.yaml index efa1dd2d..2a672de1 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1,6 @@ # ffd-retief-hrd fanfictiondownloader application: fanfictiondownloader -version: 4-4-69 +version: 4-4-70 runtime: python27 api_version: 1 threadsafe: true diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index bcbd6b85..05ff3213 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -26,7 +26,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, 40) + version = (1, 7, 41) minimum_calibre_version = (0, 8, 57) #: 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 c392c46a..5f6a87da 100644 --- a/fanficdownloader/adapters/adapter_archiveofourownorg.py +++ b/fanficdownloader/adapters/adapter_archiveofourownorg.py @@ -288,15 +288,16 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter): # Find Series name from series URL. ddseries = metasoup.find('dd',{'class':"series"}) - for i, a in enumerate(ddseries.findAll('a', href=re.compile(r"/series/\d+"))): - series_name = stripHTML(a) - series_url = 'http://'+self.host+a['href'] - series_index = int(stripHTML(a.previousSibling).replace(', ','').split(' ')[1]) # "Part # of" or ", Part #" - self.story.setMetadata('series%02d'%i,"%s [%s]"%(series_name,series_index)) - self.story.setMetadata('series%02dUrl'%i,series_url) - if i == 0: - self.setSeries(series_name, series_index) - self.story.setMetadata('seriesUrl',series_url) + if ddseries: + for i, a in enumerate(ddseries.findAll('a', href=re.compile(r"/series/\d+"))): + series_name = stripHTML(a) + series_url = 'http://'+self.host+a['href'] + series_index = int(stripHTML(a.previousSibling).replace(', ','').split(' ')[1]) # "Part # of" or ", Part #" + self.story.setMetadata('series%02d'%i,"%s [%s]"%(series_name,series_index)) + self.story.setMetadata('series%02dUrl'%i,series_url) + if i == 0: + self.setSeries(series_name, series_index) + self.story.setMetadata('seriesUrl',series_url) # grab the text for an individual chapter. def getChapterText(self, url):