diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 4dc026a..8a07534 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, 5, 13) + version = (1, 5, 14) minimum_calibre_version = (0, 8, 30) #: This field defines the GUI plugin class that contains all the code diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py index 04f74f8..5d33643 100644 --- a/calibre-plugin/config.py +++ b/calibre-plugin/config.py @@ -283,7 +283,7 @@ class BasicTab(QWidget): # this is a cheat to make it easier for users to realize there's a new include_images features. self.includeimages = QCheckBox("Include images in EPUBs?",self) - self.includeimages.setToolTip("Download and include images in EPUB stories. This is equivalent to adding:\n\n[defaults]\ninclude_images:true\nkeep_summary_html:true\nmake_firstimage_cover:true\n\n ...to the top of personal.ini. Your settings in personal.ini will override this.") + self.includeimages.setToolTip("Download and include images in EPUB stories. This is equivalent to adding:\n\n[epub]\ninclude_images:true\nkeep_summary_html:true\nmake_firstimage_cover:true\n\n ...to the top of personal.ini. Your settings in personal.ini will override this.") self.includeimages.setChecked(prefs['includeimages']) self.l.addWidget(self.includeimages) diff --git a/calibre-plugin/ffdl_plugin.py b/calibre-plugin/ffdl_plugin.py index a83806e..6be7a61 100644 --- a/calibre-plugin/ffdl_plugin.py +++ b/calibre-plugin/ffdl_plugin.py @@ -420,7 +420,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction): options['personal.ini'] = prefs['personal.ini'] if prefs['includeimages']: # this is a cheat to make it easier for users. - options['personal.ini'] = '''[defaults] + options['personal.ini'] = '''[epub] include_images:true keep_summary_html:true make_firstimage_cover:true diff --git a/fanficdownloader/adapters/adapter_fimfictionnet.py b/fanficdownloader/adapters/adapter_fimfictionnet.py index cc58b51..a56870b 100644 --- a/fanficdownloader/adapters/adapter_fimfictionnet.py +++ b/fanficdownloader/adapters/adapter_fimfictionnet.py @@ -155,11 +155,14 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter): description_soup.find('a', {"class":"more"}).extract() except: pass - + # fimfic is the first site with an explicit cover image. story_img = soup.find('img',{'class':'story_image'}) if self.getConfig('include_images') and story_img: - self.story.addImgUrl(self,self.url,story_img['src'],self._fetchUrlRaw,cover=True) + coverurl = story_img['src'] + if coverurl.startswith('//static.fimfiction.net'): # fix for img urls missing 'http:' + coverurl = "http:"+coverurl + self.story.addImgUrl(self,self.url,coverurl,self._fetchUrlRaw,cover=True) self.setDescription(self.url,description_soup.text) #self.story.setMetadata('description', description_soup.text)