From a2a3efce52fe23e49eebbd8df77df6f2f3ea5dd8 Mon Sep 17 00:00:00 2001 From: Dmitry Snegirev Date: Sat, 5 May 2018 10:25:01 +0300 Subject: [PATCH] fix chapter names in www.novelall.com --- fanficfare/adapters/adapter_wwwnovelallcom.py | 8 ++++---- fanficfare/cli.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fanficfare/adapters/adapter_wwwnovelallcom.py b/fanficfare/adapters/adapter_wwwnovelallcom.py index dbc98b26..4ae50b21 100644 --- a/fanficfare/adapters/adapter_wwwnovelallcom.py +++ b/fanficfare/adapters/adapter_wwwnovelallcom.py @@ -70,8 +70,8 @@ class WWWNovelAllComAdapter(BaseSiteAdapter): # normalized story URL. self._setURL("https://"+self.getSiteDomain() - +"/novel/"+self.story.getMetadata('storyId') - +".html") + + "/novel/"+self.story.getMetadata('storyId') + + ".html") else: raise exceptions.InvalidStoryURL(url, self.getSiteDomain(), @@ -155,7 +155,7 @@ class WWWNovelAllComAdapter(BaseSiteAdapter): self.story.setMetadata('released', released.find_next_sibling('a').string.strip()) ## getting follows - follows = soup.find('num', {"id":"follow_num"}) + follows = soup.find('num', {"id": "follow_num"}) if follows: self.story.setMetadata('follows', follows.string) @@ -202,7 +202,7 @@ class WWWNovelAllComAdapter(BaseSiteAdapter): cdates.append(makeDate(dt, '%b %d, %Y')) # a = li.find('a') - ctitle = a['title'].replace(title, '').strip() + ctitle = re.sub(r"^%s(.+)$" % re.escape(title), r"\1", a['title'], 0, re.UNICODE | re.IGNORECASE).strip() self.chapterUrls.append((ctitle, a['href'])) cdates.sort() diff --git a/fanficfare/cli.py b/fanficfare/cli.py index 9e7b745f..ee0b45f5 100644 --- a/fanficfare/cli.py +++ b/fanficfare/cli.py @@ -437,7 +437,7 @@ def do_download(arg, call(string.Template(adapter.getConfig('pre_process_cmd')).substitute(metadata), shell=True) output_filename = write_story(configuration, adapter, options.format, options.metaonly) - + if options.metaonly: metadata['output_filename'] = output_filename if options.jsonmeta: