From 61019402777d603aff4095314add27d8970f0234 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 15 Mar 2015 20:40:39 +0530 Subject: [PATCH] Update Wired Daily --- recipes/wired_daily.recipe | 66 +++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/recipes/wired_daily.recipe b/recipes/wired_daily.recipe index 44e11c8e52..a102e16090 100644 --- a/recipes/wired_daily.recipe +++ b/recipes/wired_daily.recipe @@ -9,7 +9,9 @@ from calibre.web.feeds.news import BasicNewsRecipe class WiredDailyNews(BasicNewsRecipe): title = 'Wired Daily Edition' __author__ = 'Darko Miletic' - description = 'Wired is a full-color monthly American magazine, published in both print and online editions, that reports on how emerging technologies affect culture, the economy and politics.' + description = ('Wired is a full-color monthly American magazine, published in both print ' + 'and online editions, that reports on how emerging technologies affect culture,' + 'the economy and politics.') publisher = 'Conde Nast' category = 'news, IT, computers, technology' oldest_article = 2 @@ -21,57 +23,47 @@ class WiredDailyNews(BasicNewsRecipe): ignore_duplicate_articles = {'url'} remove_empty_feeds = True publication_type = 'newsportal' - masthead_url = 'http://www.wired.com/images/home/wired_logo.gif' extra_css = """ .entry-header{ - text-transform: uppercase; - vertical-align: baseline; + text-transform: uppercase; + vertical-align: baseline; display: inline; } - ul li{display: inline} + ul li{display: inline} """ - conversion_options = { - 'comment' : description - , 'tags' : category - , 'publisher' : publisher - , 'language' : language - } - remove_tags = [ - dict(name=['meta','link']), - dict(name='div', attrs={'class':'podcast_storyboard'}) + dict(name=['meta','link']), + dict(name='div', attrs={'class':'podcast_storyboard'}), + dict(id='article-tags'), ] keep_only_tags=[ - dict(name='h1' , attrs={'id' :'headline' }), - dict(name='ul' , attrs={'class':'entry-header'}), - dict(name='div', attrs={'class':'entry' }) - ] + dict(attrs={'data-js':['post', 'postHeader']}), + ] feeds = [ - (u'Top Stories' , u'http://feeds.wired.com/wired/index' ) - ,(u'Product reviews' , u'http://feeds.wired.com/WiredReviews' ) - ,(u'Autopia' , u'http://feeds.wired.com/wiredautopia' ) + (u'Top Stories' , u'http://feeds.wired.com/wired/index') + ,(u'Product reviews' , u'http://feeds.wired.com/WiredReviews') + ,(u'Autopia' , u'http://feeds.wired.com/wiredautopia') ,(u'Business' , u'http://feeds.wired.com/wiredbusinessblog') - ,(u'Danger Room' , u'http://feeds.wired.com/WiredDangerRoom' ) - ,(u'Gadget Lab' , u'http://feeds.wired.com/GearFactor' ) - ,(u'Game Life' , u'http://feeds.wired.com/Gamelife' ) - ,(u'GeekMom' , u'http://feeds.wired.com/wiredgeekmom/' ) - ,(u'Innovation Insights', u'http://feeds.wired.com/wiredinsights' ) - ,(u'Opinion' , u'http://feeds.wired.com/wiredopinion/' ) - ,(u'Playbook' , u'http://feeds.wired.com/wiredplaybook/' ) - ,(u'This day in Tech' , u'http://feeds.wired.com/ThisDayInTech' ) - ,(u'Threat level' , u'http://feeds.wired.com/wired27b' ) - ,(u'Design' , u'http://feeds.wired.com/wired/design' ) - ,(u'Underwire' , u'http://feeds.wired.com/wiredunderwire' ) - ,(u'Enterprise' , u'http://feeds.wired.com/wiredenterprise/' ) - ,(u'Science' , u'http://feeds.wired.com/wiredscience' ) + ,(u'Danger Room' , u'http://feeds.wired.com/WiredDangerRoom') + ,(u'Gadget Lab' , u'http://feeds.wired.com/GearFactor') + ,(u'Game Life' , u'http://feeds.wired.com/Gamelife') + ,(u'GeekMom' , u'http://feeds.wired.com/wiredgeekmom/') + ,(u'Innovation Insights', u'http://feeds.wired.com/wiredinsights') + ,(u'Opinion' , u'http://feeds.wired.com/wiredopinion/') + ,(u'Playbook' , u'http://feeds.wired.com/wiredplaybook/') + ,(u'This day in Tech' , u'http://feeds.wired.com/ThisDayInTech') + ,(u'Threat level' , u'http://feeds.wired.com/wired27b') + ,(u'Design' , u'http://feeds.wired.com/wired/design') + ,(u'Underwire' , u'http://feeds.wired.com/wiredunderwire') + ,(u'Enterprise' , u'http://feeds.wired.com/wiredenterprise/') + ,(u'Science' , u'http://feeds.wired.com/wiredscience') ] def get_article_url(self, article): url = article.get('guid', None) try: - return self.browser.open_novisit(url).geturl() # resolve redirect. + return self.browser.open_novisit(url).geturl() # resolve redirect. except: - return url - + return url