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

Ensure delay is respected after a failed feed

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-26 11:42:10 +05:30
parent ffb187960f
commit 90d474dafe
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1678,14 +1678,13 @@ class BasicNewsRecipe(Recipe):
if purl.username and purl.password: if purl.username and purl.password:
br.add_password(url, purl.username, purl.password) br.add_password(url, purl.username, purl.password)
with closing(br.open_novisit(url)) as f: with closing(br.open_novisit(url)) as f:
parsed_feeds.append(feed_from_xml(f.read(), raw = f.read()
title=title, parsed_feeds.append(feed_from_xml(
log=self.log, raw, title=title, log=self.log,
oldest_article=self.oldest_article, oldest_article=self.oldest_article,
max_articles_per_feed=self.max_articles_per_feed, max_articles_per_feed=self.max_articles_per_feed,
get_article_url=self.get_article_url)) get_article_url=self.get_article_url
if (self.delay > 0): ))
time.sleep(self.delay)
except Exception as err: except Exception as err:
feed = Feed() feed = Feed()
msg = 'Failed feed: %s'%(title if title else url) msg = 'Failed feed: %s'%(title if title else url)
@ -1693,6 +1692,8 @@ class BasicNewsRecipe(Recipe):
feed.description = as_unicode(err) feed.description = as_unicode(err)
parsed_feeds.append(feed) parsed_feeds.append(feed)
self.log.exception(msg) self.log.exception(msg)
if self.delay > 0:
time.sleep(self.delay)
remove = [fl for fl in parsed_feeds if len(fl) == 0 and self.remove_empty_feeds] remove = [fl for fl in parsed_feeds if len(fl) == 0 and self.remove_empty_feeds]
for f in remove: for f in remove: