diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 47218517..e0713b81 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, 6, 3) + version = (1, 6, 4) 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 6ca25fb2..528aa6c8 100644 --- a/calibre-plugin/ffdl_plugin.py +++ b/calibre-plugin/ffdl_plugin.py @@ -777,20 +777,20 @@ make_firstimage_cover:true

Proceed with updating your library?

'''%(len(good_list),len(bad_list)) - htmllog='' + htmllog='
StatusTitleAuthorURLComment
' for book in good_list: if 'status' in book: status = book['status'] else: status = 'Good' - htmllog = htmllog + '' + htmllog = htmllog + '' for book in bad_list: if 'status' in book: status = book['status'] else: status = 'Bad' - htmllog = htmllog + '' + htmllog = htmllog + '' htmllog = htmllog + '
StatusTitleAuthorCommentURL
' + ''.join([status,book['title'],", ".join(book['author']),book['url'],book['comment']]) + '
' + ''.join([status,book['title'],", ".join(book['author']),book['comment'],book['url']]) + '
' + ''.join([status,book['title'],", ".join(book['author']),book['url'],book['comment']]) + '
' + ''.join([status,book['title'],", ".join(book['author']),book['comment'],book['url']]) + '
' diff --git a/fanficdownloader/adapters/adapter_yourfanfictioncom.py b/fanficdownloader/adapters/adapter_yourfanfictioncom.py index d36c8041..44864e16 100644 --- a/fanficdownloader/adapters/adapter_yourfanfictioncom.py +++ b/fanficdownloader/adapters/adapter_yourfanfictioncom.py @@ -141,7 +141,6 @@ class YourFanfictionComAdapter(BaseSiteAdapter): if "Access denied. This story has not been validated by the adminstrators of this site." in data: raise exceptions.FailedToDownload(self.getSiteDomain() +" says: Access denied. This story has not been validated by the adminstrators of this site.") - # use BeautifulSoup HTML parser to make everything easier to find. # because for some reason, this works while simple 'print data' errors on ascii conversion. # loopdata = data # chklen=5000 @@ -151,6 +150,7 @@ class YourFanfictionComAdapter(BaseSiteAdapter): # logging.info("loopdata: %s" % loopdata[:chklen]) # loopdata = loopdata[chklen:] + # use BeautifulSoup HTML parser to make everything easier to find. soup = bs.BeautifulSoup(data) # Now go hunting for all the meta data and the chapter list. @@ -191,9 +191,11 @@ class YourFanfictionComAdapter(BaseSiteAdapter): if 'Summary' in label: ## Everything until the next span class='label' svalue = "" - while not defaultGetattr(value,'class') == 'label': + while value and not defaultGetattr(value,'class') == 'label': svalue += str(value) value = value.nextSibling + # sometimes poorly formated desc (

w/o

) leads + # to all labels being included. self.setDescription(url,svalue) #self.story.setMetadata('description',stripHTML(svalue)) diff --git a/plugin-defaults.ini b/plugin-defaults.ini index e2440fab..269f7394 100644 --- a/plugin-defaults.ini +++ b/plugin-defaults.ini @@ -19,8 +19,7 @@ ## overridden at several levels ## Some sites also require the user to confirm they are adult for -## adult content. In commandline version, this should go in your -## personal.ini, not defaults.ini. +## adult content. #is_adult:true ## All available titlepage_entries and the label used for them: diff --git a/plugin-example.ini b/plugin-example.ini index 18df0022..5b60e964 100644 --- a/plugin-example.ini +++ b/plugin-example.ini @@ -3,8 +3,7 @@ [defaults] ## Some sites also require the user to confirm they are adult for -## adult content. In commandline version, this should go in your -## personal.ini, not defaults.ini. +## adult content. #is_adult:true ## include images from img tags in the body and summary of