diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index cfb5710b..d2345878 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, 4, 4) + version = (1, 4, 5) minimum_calibre_version = (0, 8, 30) #: This field defines the GUI plugin class that contains all the code diff --git a/fanficdownloader/adapters/adapter_fanfictionnet.py b/fanficdownloader/adapters/adapter_fanfictionnet.py index f307b409..73c8f635 100644 --- a/fanficdownloader/adapters/adapter_fanfictionnet.py +++ b/fanficdownloader/adapters/adapter_fanfictionnet.py @@ -74,6 +74,7 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter): # use BeautifulSoup HTML parser to make everything easier to find. try: data = self._fetchUrl(url) + #print("\n===================\n%s\n===================\n"%data) soup = bs.BeautifulSoup(data) except urllib2.HTTPError, e: if e.code == 404: @@ -141,7 +142,7 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter): continue if 'var storyid' in script.string: for line in script.string.split('\n'): - m = re.match(r"^ +var ([^ ]+) = '?(.*?)'?;$",line) + m = re.match(r"^ +var ([^ ]+) = '?(.*?)'?;\r?$",line) if m == None : continue var,value = m.groups() # remove javascript escaping from values.