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

Fix non XML safe characters in feed descriptions causing news download to fail. Fixes #1707545 [News Resource download not working..National Review Online](https://bugs.launchpad.net/calibre/+bug/1707545)

Browse Source
This commit is contained in:
Kovid Goyal 2017-07-31 19:57:00 +05:30
parent 790b8273a7
commit bf5867e380
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,7 @@ class FeedTemplate(Template):
), ),
CLASS('calibre_feed_image'))) CLASS('calibre_feed_image')))
if getattr(feed, 'description', None): if getattr(feed, 'description', None):
d = DIV(feed.description, CLASS('calibre_feed_description', d = DIV(clean_xml_chars(feed.description), CLASS('calibre_feed_description',
'calibre_rescale_80')) 'calibre_rescale_80'))
d.append(BR()) d.append(BR())
div.append(d) div.append(d)
@ -284,6 +284,7 @@ class TouchscreenIndexTemplate(Template):
class TouchscreenFeedTemplate(Template): class TouchscreenFeedTemplate(Template):
def _generate(self, f, feeds, cutoff, extra_css=None, style=None): def _generate(self, f, feeds, cutoff, extra_css=None, style=None):
from calibre.utils.cleantext import clean_xml_chars
def trim_title(title,clip=18): def trim_title(title,clip=18):
if len(title)>clip: if len(title)>clip:
@ -353,7 +354,7 @@ class TouchscreenFeedTemplate(Template):
), ),
CLASS('calibre_feed_image'))) CLASS('calibre_feed_image')))
if getattr(feed, 'description', None): if getattr(feed, 'description', None):
d = DIV(feed.description, CLASS('calibre_feed_description', d = DIV(clean_xml_chars(feed.description), CLASS('calibre_feed_description',
'calibre_rescale_80')) 'calibre_rescale_80'))
d.append(BR()) d.append(BR())
div.append(d) div.append(d)