diff --git a/resources/images/news/dailyreckoning.png b/resources/images/news/dailyreckoning.png new file mode 100644 index 0000000000..64cd95d173 Binary files /dev/null and b/resources/images/news/dailyreckoning.png differ diff --git a/resources/recipes/dailyreckoning.recipe b/resources/recipes/dailyreckoning.recipe new file mode 100644 index 0000000000..5522427fba --- /dev/null +++ b/resources/recipes/dailyreckoning.recipe @@ -0,0 +1,47 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2009, Darko Miletic ' +''' +dailyreckoning.com +''' +from calibre.web.feeds.news import BasicNewsRecipe + +class dailyreckoning_us(BasicNewsRecipe): + title = 'The Daily Reckoning - US edition' + __author__ = 'Darko Miletic' + description = 'Worldwide business and financial news and articles' + publisher = 'Agora Financial, LLC.' + category = 'news, business, finances, money, banking' + oldest_article = 7 + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + encoding = 'utf-8' + language = 'en' + extra_css = ' #BlogTitle{font-size: x-large; font-weight: bold} #BlogDate{font-size: small} ' + + conversion_options = { + 'comment' : description + , 'tags' : category + , 'publisher' : publisher + , 'language' : language + } + + feeds = [(u'Articles', u'http://feeds.feedburner.com/dailyreckoning?format=xml')] + + keep_only_tags = [dict(name='div', attrs={'id':'Outline'})] + + remove_tags = [ + dict(name=['object','link','base']) + ,dict(name='hr', attrs={'class':'Divider'}) + ] + + remove_tags_after = dict(name='hr', attrs={'class':'Divider'}) + + def get_article_url(self, article): + return article.get('feedburner_origlink', article.get('link')) + + def print_version(self, url): + return url + 'print/' + diff --git a/resources/recipes/nakedcapitalism.recipe b/resources/recipes/nakedcapitalism.recipe new file mode 100644 index 0000000000..09b7d8de1b --- /dev/null +++ b/resources/recipes/nakedcapitalism.recipe @@ -0,0 +1,39 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2009, Darko Miletic ' +''' +www.nakedcapitalism.com +''' +from calibre.web.feeds.news import BasicNewsRecipe + +class nakedcapitalism(BasicNewsRecipe): + title = 'Naked Capitalism' + __author__ = 'Darko Miletic' + description = 'Commentary on current economic and financial news.' + publisher = 'Aurora Advisors, Inc.' + category = 'news, business, finances, money, banking' + oldest_article = 7 + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + encoding = 'utf-8' + language = 'en' + extra_css = ' #BlogTitle{font-size: x-large; font-weight: bold} #BlogDate{font-size: small} ' + + conversion_options = { + 'comment' : description + , 'tags' : category + , 'publisher' : publisher + , 'language' : language + } + + feeds = [(u'Articles', u'http://www.nakedcapitalism.com/feed')] + + keep_only_tags = [ + dict(name='h3', attrs={'class':'post-title entry-title'}) + ,dict(name='div', attrs={'class':'entry'}) + ] + + remove_tags = [dict(name=['object','link','base'])] + diff --git a/src/calibre/linux.py b/src/calibre/linux.py index 62af807f4c..c0e76b8690 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -172,8 +172,6 @@ class PostInstall: from calibre.ebooks.metadata.cli import option_parser as metaop, filetypes as meta_filetypes from calibre.ebooks.lrf.lrfparser import option_parser as lrf2lrsop from calibre.gui2.lrf_renderer.main import option_parser as lrfviewerop - from calibre.web.fetch.simple import option_parser as web2disk - from calibre.web.feeds.recipes import titles as feed_titles from calibre.ebooks.metadata.fetch import option_parser as fem_op from calibre.gui2.main import option_parser as guiop from calibre.utils.smtp import option_parser as smtp_op @@ -195,7 +193,6 @@ class PostInstall: f.write(opts_and_exts('lrf2lrs', lrf2lrsop, ['lrf'])) f.write(opts_and_exts('ebook-meta', metaop, list(meta_filetypes()))) f.write(opts_and_exts('lrfviewer', lrfviewerop, ['lrf'])) - f.write(opts_and_words('web2disk', web2disk, feed_titles)) f.write(opts_and_words('fetch-ebook-metadata', fem_op, [])) f.write(opts_and_words('calibre-smtp', smtp_op, [])) f.write(textwrap.dedent('''