From f2c278146c4d7a501cfdcd15e542be55866ec746 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 10 Jul 2011 20:19:37 -0600 Subject: [PATCH] Fix #807519 (Computer Act!ve Recipe broken) --- recipes/computer_active.recipe | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/recipes/computer_active.recipe b/recipes/computer_active.recipe index b35e42ab01..d1ab94056c 100644 --- a/recipes/computer_active.recipe +++ b/recipes/computer_active.recipe @@ -1,9 +1,9 @@ #!/usr/bin/env python __license__ = 'GPL v3' __author__ = 'DrMerry Based on v1.01 by Lorenzo Vigentini' -__copyright__ = 'For version 1.02: DrMerry' -__version__ = 'v1.02' -__date__ = '08, July 2011' +__copyright__ = 'For version 1.02, 1.03: DrMerry' +__version__ = 'v1.03' +__date__ = '11, July 2011' __description__ = 'Computeractive publishes new downloads, reviews, news stories, step-by-step guides and answers to PC problems every day. Original version (c): 2009, Lorenzo Vigentini ' ''' @@ -11,9 +11,10 @@ http://www.computeractive.co.uk/ ''' from calibre.web.feeds.news import BasicNewsRecipe +import re class computeractive(BasicNewsRecipe): - __author__ = 'Lorenzo Vigentini' + __author__ = 'DrMerry' description = 'Computeractive publishes new downloads, reviews, news stories, step-by-step guides and answers to PC problems every day.' cover_url = 'http://images.pcworld.com/images/common/header/header-logo.gif' @@ -31,6 +32,8 @@ class computeractive(BasicNewsRecipe): remove_javascript = True no_stylesheets = True + remove_empty_feeds = True + remove_tags_after = dict(name='div', attrs={'class':'article_tags_block'}) keep_only_tags = [ dict(name='div', attrs={'id':'container_left'}) @@ -42,13 +45,14 @@ class computeractive(BasicNewsRecipe): dict(name='a', attrs={'class':'largerImage'}) ] + preprocess_regexps = [ + (re.compile(r'(]*>|)', re.DOTALL|re.IGNORECASE), + lambda match: ''), + ] + feeds = [ (u'General content', u'http://feeds.computeractive.co.uk/rss/latest/computeractive/all'), (u'News', u'http://feeds.computeractive.co.uk/rss/latest/computeractive/news'), - (u'Downloads', u'http://feeds.computeractive.co.uk/rss/latest/computeractive/downloads'), - (u'Hardware', u'http://feeds.computeractive.co.uk/rss/latest/computeractive/hardware'), - (u'Software', u'http://feeds.computeractive.co.uk/rss/latest/computeractive/software'), - (u'Competitions', u'http://www.v3.co.uk/feeds/rss20/personal-technology/competitions') ]