Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-05 13:13:38 +02:00
Code Issues Projects Releases Wiki Activity

Fix #8414 (make use_embedded_content settable per feed)

Browse source
This commit is contained in:
Kovid Goyal 2011-01-16 19:32:58 -07:00
commit b6c84581a4
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/calibre/web/feeds/news.py
View file

@ -901,10 +901,7 @@ def build_index(self):
if self.test:
feeds = feeds[:2]
self.has_single_feed = len(feeds) == 1
if self.use_embedded_content is None:
self.use_embedded_content = feeds[0].has_embedded_content()
index = os.path.join(self.output_dir, 'index.html')
html = self.feeds2index(feeds)
@ -939,7 +936,9 @@ def build_index(self):
url = None
if not url:
continue
func, arg = (self.fetch_embedded_article, article) if self.use_embedded_content else \
func, arg = (self.fetch_embedded_article, article) \
if self.use_embedded_content or (self.use_embedded_content == None and feed.has_embedded_content()) \
else \
((self.fetch_obfuscated_article if self.articles_are_obfuscated \
else self.fetch_article), url)
req = WorkRequest(func, (arg, art_dir, f, a, len(feed)),