diff --git a/src/calibre/ebooks/metadata/isbndb.py b/src/calibre/ebooks/metadata/isbndb.py index 3cf5f92eaf..487a52335b 100644 --- a/src/calibre/ebooks/metadata/isbndb.py +++ b/src/calibre/ebooks/metadata/isbndb.py @@ -112,7 +112,8 @@ key is the account key you generate after signing up for a free account from isb default=None, help=_('The title of the book to search for.')) parser.add_option('-p', '--publisher', default=None, dest='publisher', help=_('The publisher of the book to search for.')) - parser.add_option('--verbose', default=False, action='store_true', help=_('Verbose processing')) + parser.add_option('-v', '--verbose', default=False, + action='store_true', help=_('Verbose processing')) return parser diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index 8253021c57..b2c18b26a8 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -33,7 +33,7 @@ recipe_modules = ['recipe_' + r for r in ( 'la_republica', 'physics_today', 'chicago_tribune', 'e_novine', 'al_jazeera', 'winsupersite', 'borba', 'courrierinternational', 'lamujerdemivida', 'soldiers', 'theonion', 'news_times', - 'el_universal', 'mediapart', 'wikinews_en', + 'el_universal', 'mediapart', 'wikinews_en', 'ecogeek', )] import re, imp, inspect, time, os diff --git a/src/calibre/web/feeds/recipes/recipe_ecogeek.py b/src/calibre/web/feeds/recipes/recipe_ecogeek.py new file mode 100644 index 0000000000..7695763295 --- /dev/null +++ b/src/calibre/web/feeds/recipes/recipe_ecogeek.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2009, Darko Miletic ' +''' +EcoGeek.org +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class EcoGeek(BasicNewsRecipe): + title = 'EcoGeek' + __author__ = 'Darko Miletic' + description = 'EcoGeek - Technology for the Environment Blog Feed' + publisher = 'EcoGeek' + language = _('English') + category = 'news, ecology, blog' + oldest_article = 7 + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = True + + html2lrf_options = [ + '--comment', description + , '--category', category + , '--publisher', publisher + ] + + html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' + + feeds = [(u'Posts', u'http://feeds2.feedburner.com/EcoGeek')]