Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix nasty regression that was preventing passworded recipes from working correctly. Fixes #1226 (WSJ Fails to Download Full Text of Most Articles)

Browse Source
This commit is contained in:
Kovid Goyal 2008-11-05 12:34:42 -08:00
parent d13c39c87e
commit 2b1cebd3aa
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/web/feeds/news.py
View File

@ -619,6 +619,7 @@ class BasicNewsRecipe(object, LoggingInterface):
return logger, out return logger, out
def _fetch_article(self, url, dir, logger, f, a, num_of_feeds): def _fetch_article(self, url, dir, logger, f, a, num_of_feeds):
self.web2disk_options.browser = self.browser
fetcher = RecursiveFetcher(self.web2disk_options, logger, self.image_map, self.css_map, (url, f, a, num_of_feeds)) fetcher = RecursiveFetcher(self.web2disk_options, logger, self.image_map, self.css_map, (url, f, a, num_of_feeds))
fetcher.base_dir = dir fetcher.base_dir = dir
fetcher.current_dir = dir fetcher.current_dir = dir
@ -974,6 +975,7 @@ class CustomIndexRecipe(BasicNewsRecipe):
def download(self): def download(self):
index = os.path.abspath(self.custom_index()) index = os.path.abspath(self.custom_index())
url = 'file:'+index if iswindows else 'file://'+index url = 'file:'+index if iswindows else 'file://'+index
self.web2disk_options.browser = self.browser
fetcher = RecursiveFetcher(self.web2disk_options, self.logger) fetcher = RecursiveFetcher(self.web2disk_options, self.logger)
fetcher.base_dir = self.output_dir fetcher.base_dir = self.output_dir
fetcher.current_dir = self.output_dir fetcher.current_dir = self.output_dir