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

News download: Fix the check for empty feeds when generating man ToC page

Browse Source 
Fixes #1834684 [TOC missing in news download (Python 3)](https://bugs.launchpad.net/calibre/+bug/1834684)
This commit is contained in:
Kovid Goyal 2019-06-30 07:07:10 +05:30
parent 07f80229e9
commit 465ca0573b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/web/feeds/__init__.py
View File

@ -243,12 +243,6 @@ class Feed(object):
def __str__(self): def __str__(self):
return repr(self) return repr(self)
def __bool__(self):
for article in self:
if getattr(article, 'downloaded', False):
return True
return False
def has_embedded_content(self): def has_embedded_content(self):
length = 0 length = 0
for a in self: for a in self:

4
src/calibre/web/feeds/templates.py
View File

@ -102,7 +102,7 @@ class IndexTemplate(Template):
head.append(STYLE(extra_css, type='text/css')) head.append(STYLE(extra_css, type='text/css'))
ul = UL(attrs('calibre_feed_list')) ul = UL(attrs('calibre_feed_list'))
for i, feed in enumerate(feeds): for i, feed in enumerate(feeds):
if feed: if len(feed):
li = LI(A(feed.title, attrs('feed', rescale=120, li = LI(A(feed.title, attrs('feed', rescale=120,
href='feed_%d/index.html'%i)), id='feed_%d'%i) href='feed_%d/index.html'%i)), id='feed_%d'%i)
ul.append(li) ul.append(li)
@ -265,7 +265,7 @@ class TouchscreenIndexTemplate(Template):
toc = TABLE(attrs('toc'),width="100%",border="0",cellpadding="3px") toc = TABLE(attrs('toc'),width="100%",border="0",cellpadding="3px")
for i, feed in enumerate(feeds): for i, feed in enumerate(feeds):
if feed: if len(feed):
tr = TR() tr = TR()
tr.append(TD(attrs(rescale=120), A(feed.title, href='feed_%d/index.html'%i))) tr.append(TD(attrs(rescale=120), A(feed.title, href='feed_%d/index.html'%i)))
tr.append(TD('%s' % len(feed.articles), style="text-align:right")) tr.append(TD('%s' % len(feed.articles), style="text-align:right"))