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

jsnews: Fix delay and timeout parameters unused

Browse Source
This commit is contained in:
Kovid Goyal 2013-06-11 12:52:53 +05:30
parent 29269e807a
commit 7d5e556507
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/web/feeds/jsnews.py
View File

@ -115,7 +115,7 @@ class JavascriptRecipe(BasicNewsRecipe):
Override this method in your recipe if you want to use a non-standard Browser object. Override this method in your recipe if you want to use a non-standard Browser object.
''' '''
from calibre.web.jsbrowser.browser import Browser from calibre.web.jsbrowser.browser import Browser
return Browser(default_timeout=kwargs.get('default_timeout', 120)) return Browser(default_timeout=kwargs.get('default_timeout', self.timeout))
def do_login(self, browser, username, password): def do_login(self, browser, username, password):
''' '''
@ -375,6 +375,7 @@ class JavascriptRecipe(BasicNewsRecipe):
remove_before=self.remove_tags_before, remove_before=self.remove_tags_before,
remove_after=self.remove_tags_after, remove_after=self.remove_tags_after,
remove_javascript=self.remove_javascript, remove_javascript=self.remove_javascript,
delay=self.delay,
resource_cache=resource_cache, output_dir=art_dir, browser=browser) resource_cache=resource_cache, output_dir=art_dir, browser=browser)
except AbortFetch: except AbortFetch:
self.log.exception('Fetching of article: %r aborted' % article.title) self.log.exception('Fetching of article: %r aborted' % article.title)

6
src/calibre/web/fetch/javascript.py
View File

@ -197,6 +197,7 @@ def fetch_page(
remove_before=None, remove_before=None,
remove=(), remove=(),
remove_javascript=True, remove_javascript=True,
delay=0,
preprocess_browser=lambda browser, url, stage, recursion_level:None, preprocess_browser=lambda browser, url, stage, recursion_level:None,
postprocess_html=lambda root, url, recursion_level: root, postprocess_html=lambda root, url, recursion_level: root,
resource_cache={}, resource_cache={},
@ -209,6 +210,9 @@ def fetch_page(
if browser is None: if browser is None:
browser = jsbrowser() browser = jsbrowser()
if delay:
time.sleep(delay)
# Load the DOM # Load the DOM
if url is not None: if url is not None:
start_time = time.time() start_time = time.time()
@ -241,7 +245,7 @@ def fetch_page(
curl, load_complete=load_complete, links=links, keep_only=keep_only, curl, load_complete=load_complete, links=links, keep_only=keep_only,
remove_after=remove_after, remove_before=remove_before, remove=remove, remove_after=remove_after, remove_before=remove_before, remove=remove,
preprocess_browser=preprocess_browser, postprocess_html=postprocess_html, preprocess_browser=preprocess_browser, postprocess_html=postprocess_html,
resource_cache=resource_cache, output_dir=odir, browser=browser, resource_cache=resource_cache, output_dir=odir, browser=browser, delay=delay,
recursion_level=recursion_level+1)) recursion_level=recursion_level+1))
except AbortFetch: except AbortFetch:
continue continue