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

make use_embedded_content settable per feed

Browse Source
This commit is contained in:
Shixin Zeng 2011-01-16 19:43:13 -06:00
parent ca0e545253
commit 7a79f8d98d
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 @@ class BasicNewsRecipe(Recipe):
if self.test: if self.test:
feeds = feeds[:2] feeds = feeds[:2]
self.has_single_feed = len(feeds) == 1 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') index = os.path.join(self.output_dir, 'index.html')
html = self.feeds2index(feeds) html = self.feeds2index(feeds)
@ -939,7 +936,9 @@ class BasicNewsRecipe(Recipe):
url = None url = None
if not url: if not url:
continue 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 \ ((self.fetch_obfuscated_article if self.articles_are_obfuscated \
else self.fetch_article), url) else self.fetch_article), url)
req = WorkRequest(func, (arg, art_dir, f, a, len(feed)), req = WorkRequest(func, (arg, art_dir, f, a, len(feed)),