From 7178234279653666696d57d97cee03fa33dbfb01 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 1 Feb 2010 21:05:01 -0700 Subject: [PATCH] Updated recipes for Discover Magazine, Metro Montreal --- resources/recipes/discover_magazine.recipe | 52 ++++++++----------- resources/recipes/metro_montreal.recipe | 29 ++++++----- .../gui2/device_drivers/configwidget.py | 2 +- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/resources/recipes/discover_magazine.recipe b/resources/recipes/discover_magazine.recipe index 0d2ee3ee74..cd4a078231 100644 --- a/resources/recipes/discover_magazine.recipe +++ b/resources/recipes/discover_magazine.recipe @@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' ''' -doscovermagazine.com +discovermagazine.com ''' from calibre.web.feeds.news import BasicNewsRecipe @@ -12,42 +12,36 @@ from calibre.web.feeds.news import BasicNewsRecipe class DiscoverMagazine(BasicNewsRecipe): title = u'Discover Magazine' - description = u'Science, Technology and the Future' - __author__ = 'Mike Diaz' + description = u'Science, Technology and the Future' + __author__ = 'Mike Diaz' language = 'en' oldest_article = 33 max_articles_per_feed = 20 no_stylesheets = True - remove_javascript = True + remove_javascript = True use_embedded_content = False encoding = 'utf-8' - extra_css = '.headline {font-size: x-large;} \n .fact {padding-top: 10pt}' + + remove_tags = [dict(name='div', attrs={'id':['searchModule', 'mainMenu', 'tool-box']}), + dict(name='img', attrs={'src':'http://discovermagazine.com/onebyone.gif'})] - remove_tags_before = dict(id='articlePage') - - keep_only_tags = [dict(name='div', attrs={'id':'articlePage'})] - - remove_tags = [dict(attrs={'id':['buttons', 'tool-box', 'teaser', 'already-subscriber', 'teaser-suite', 'related-articles', 'relatedItem', 'box-popular', 'box-blogs', 'box-news', 'footer']}), - dict(attrs={'class':'popularNewsBox'}), - dict(name=['img', 'style', 'head'])] - - remove_tags_after = dict(id='articlePage') - + remove_tags_after = [dict(name='div', attrs={'class':'articlebody'})] + feeds = [ - (u'Technology', u'http://discovermagazine.com/topics/technology/rss.xml'), - (u'Health - Medicine', u'http://discovermagazine.com/topics/health-medicine/rss.xml'), - (u'Mind Brain', u'http://discovermagazine.com/topics/mind-brain/rss.xml'), - (u'Space', u'http://discovermagazine.com/topics/space/rss.xml'), - (u'Human Origins', u'http://discovermagazine.com/topics/human-origins/rss.xml'), - (u'Living World', u'http://discovermagazine.com/topics/living-world/rss.xml'), - (u'Environment', u'http://discovermagazine.com/topics/environment/rss.xml'), - (u'Physics & Math', u'http://discovermagazine.com/topics/physics-math/rss.xml'), - (u'Vital Signs', u'http://discovermagazine.com/columns/vital-signs/rss.xml'), - (u"20 Things you didn't know about...", u'http://discovermagazine.com/columns/20-things-you-didnt-know/rss.xml'), - (u'Fuzzy Math', u'http://discovermagazine.com/columns/fuzzy-math/rss.xml'), - (u'The Brain', u'http://discovermagazine.com/columns/the-brain/rss.xml'), - (u'Stupid Science Word of the Month', u'http://discovermagazine.com/columns/stupid-science-word-of-the-month/rss.xml'), + (u'Technology', u'http://discovermagazine.com/topics/technology/rss.xml'), + (u'Health - Medicine', u'http://discovermagazine.com/topics/health-medicine/rss.xml'), + (u'Mind Brain', u'http://discovermagazine.com/topics/mind-brain/rss.xml'), + (u'Space', u'http://discovermagazine.com/topics/space/rss.xml'), + (u'Human Origins', u'http://discovermagazine.com/topics/human-origins/rss.xml'), + (u'Living World', u'http://discovermagazine.com/topics/living-world/rss.xml'), + (u'Environment', u'http://discovermagazine.com/topics/environment/rss.xml'), + (u'Physics & Math', u'http://discovermagazine.com/topics/physics-math/rss.xml'), + (u'Vital Signs', u'http://discovermagazine.com/columns/vital-signs/rss.xml'), + (u"20 Things you didn't know about...", u'http://discovermagazine.com/columns/20-things-you-didnt-know/rss.xml'), + (u'Fuzzy Math', u'http://discovermagazine.com/columns/fuzzy-math/rss.xml'), + (u'The Brain', u'http://discovermagazine.com/columns/the-brain/rss.xml'), + (u'Stupid Science Word of the Month', u'http://discovermagazine.com/columns/stupid-science-word-of-the-month/rss.xml'), (u'Science Not Fiction', u'http://blogs.discovermagazine.com/sciencenotfiction/wp-rss.php') - ] + ] \ No newline at end of file diff --git a/resources/recipes/metro_montreal.recipe b/resources/recipes/metro_montreal.recipe index 094f00316f..8272c760cc 100644 --- a/resources/recipes/metro_montreal.recipe +++ b/resources/recipes/metro_montreal.recipe @@ -4,21 +4,26 @@ class Metro_Montreal(BasicNewsRecipe): title = u'M\xe9tro Montr\xe9al' __author__ = 'Jerry Clapperton' - description = u'Le quotidien le plus branch\xe9 sur le monde' - language = 'fr' + description = 'Le quotidien le plus branché sur le monde' + language = 'fr' - oldest_article = 7 + oldest_article = 7 max_articles_per_feed = 20 use_embedded_content = False - remove_javascript = True - no_stylesheets = True - encoding = 'utf-8' + remove_javascript = True + no_stylesheets = True + encoding = 'utf-8' + extra_css = '.headline {font-size: x-large;} \n .fact {padding-top: 10pt}' - extra_css = '.headline {font-size: x-large;} \n .fact {padding-top: 10pt}' - - remove_tags = [dict(attrs={'id':'buttons'}), dict(name=['img', 'style'])] - - feeds = [(u"L'info", u'http://journalmetro.com/linfo/rss'), (u'Monde', u'http://journalmetro.com/monde/rss'), (u'Culture', u'http://journalmetro.com/culture/rss'), (u'Sports', u'http://journalmetro.com/sports/rss'), (u'Paroles', u'http://journalmetro.com/paroles/rss')] + remove_tags = [dict(attrs={'id':'buttons'})] + + feeds = [ + (u"L'info", u'http://journalmetro.com/linfo/rss'), + (u'Monde', u'http://journalmetro.com/monde/rss'), + (u'Culture', u'http://journalmetro.com/culture/rss'), + (u'Sports', u'http://journalmetro.com/sports/rss'), + (u'Paroles', u'http://journalmetro.com/paroles/rss') + ] def print_version(self, url): - return url.replace('article', 'ArticlePrint') + '?language=fr' + return url.replace('article', 'ArticlePrint') + '?language=fr' \ No newline at end of file diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py index 6eb6e1226d..d1cebcb81d 100644 --- a/src/calibre/gui2/device_drivers/configwidget.py +++ b/src/calibre/gui2/device_drivers/configwidget.py @@ -38,7 +38,7 @@ class ConfigWidget(QWidget, Ui_ConfigWidget): self.opt_read_metadata.setChecked(self.settings.read_metadata) else: self.opt_read_metadata.hide() - if extra_customization_message: + if extra_customization_message and settings.extra_customization: self.extra_customization_label.setText(extra_customization_message) self.opt_extra_customization.setText(settings.extra_customization) else: