diff --git a/src/calibre/gui2/images/news/usnews.png b/src/calibre/gui2/images/news/usnews.png new file mode 100644 index 0000000000..a8ea3fb8ee Binary files /dev/null and b/src/calibre/gui2/images/news/usnews.png differ diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index 956cc1e968..dc848fe4b9 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -41,7 +41,7 @@ recipe_modules = ['recipe_' + r for r in ( 'corriere_della_sera_it', 'corriere_della_sera_en', 'msdnmag_en', 'moneynews', 'der_standard', 'diepresse', 'nzz_ger', 'hna', 'seattle_times', 'scott_hanselman', 'coding_horror', - 'stackoverflow', 'telepolis_artikel', 'zaobao', + 'stackoverflow', 'telepolis_artikel', 'zaobao', 'usnews', )] import re, imp, inspect, time, os diff --git a/src/calibre/web/feeds/recipes/recipe_spiegelde.py b/src/calibre/web/feeds/recipes/recipe_spiegelde.py index 0b1503f944..f2952be983 100644 --- a/src/calibre/web/feeds/recipes/recipe_spiegelde.py +++ b/src/calibre/web/feeds/recipes/recipe_spiegelde.py @@ -1,47 +1,64 @@ -__license__ = 'GPL v3' -__copyright__ = '2008, Kovid Goyal ' - -''' -Fetch Spiegel Online. -''' - -import re - -from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import BeautifulSoup - -class SpeigelOnline(BasicNewsRecipe): - - title = 'Spiegel Online' - description = 'Nachrichten des Magazins Der Spiegel' - __author__ = 'Kovid Goyal' - use_embedded_content = False - language = _('German') - timefmt = ' [ %Y-%m-%d %a]' - max_articles_per_feed = 40 - no_stylesheets = True - - preprocess_regexps = \ - [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in - [ - # Remove Zum Thema footer - (r'