From d54acd936eeababdf5e359c10dc48456e159a1a2 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 28 Mar 2013 11:01:14 -0500 Subject: [PATCH] PI: Allow partial download with [1-5] in addition to [1,5]. --- calibre-plugin/ffdl_plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calibre-plugin/ffdl_plugin.py b/calibre-plugin/ffdl_plugin.py index 3be4947..a6812d9 100644 --- a/calibre-plugin/ffdl_plugin.py +++ b/calibre-plugin/ffdl_plugin.py @@ -140,7 +140,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction): file_path = os.path.join(calibre_config_dir, *("plugins/fanfictiondownloader_macmenuhack.txt".split('/'))) file_path = os.path.abspath(file_path) - print("macmenuhack file_path:%s"%file_path) + print("Plugin %s macmenuhack file_path:%s"%(self.name,file_path)) self.macmenuhack = os.access(file_path, os.F_OK) return self.macmenuhack @@ -1533,7 +1533,7 @@ class FanFictionDownLoaderPlugin(InterfaceAction): def convert_url_to_book(self, url): book = self.make_book() # look here for [\d,\d] at end of url, and remove? - mc = re.match(r"^(?P.*?)(?:\[(?P\d+)?(?P,)?(?P\d+)?\])?$",url) + mc = re.match(r"^(?P.*?)(?:\[(?P\d+)?(?P[,-])?(?P\d+)?\])?$",url) #print("url:(%s) begin:(%s) end:(%s)"%(mc.group('url'),mc.group('begin'),mc.group('end'))) url = mc.group('url') book['begin'] = mc.group('begin')