diff --git a/resources/recipes/tomshardware_de.recipe b/resources/recipes/tomshardware_de.recipe index aad3d60b17..287ea6ee12 100644 --- a/resources/recipes/tomshardware_de.recipe +++ b/resources/recipes/tomshardware_de.recipe @@ -50,12 +50,14 @@ class cdnet(BasicNewsRecipe): dict(name='div', attrs={'class':'greyBoxR clearfix'}), dict(name='div', attrs={'class':'greyBoxL clearfix'}), dict(name='div', attrs={'class':'greyBox clearfix'}), + dict(name='div', attrs={'class':'labelized'}), dict(id='')] #remove_tags_before = [dict(id='header-news-title')] - remove_tags_after = [dict(name='div', attrs={'class':'btmGreyTables'})] + remove_tags_after = [dict(name='div', attrs={'class':'labelized'})] #remove_tags_after = [dict(name='div', attrs={'class':'intelliTXT'})] feeds = [ ('tomshardware', 'http://www.tomshardware.com/de/feeds/rss2/tom-s-hardware-de,12-1.xml') ] + diff --git a/resources/recipes/welt.recipe b/resources/recipes/welt.recipe index 89e0d42c09..bd5af30a63 100644 --- a/resources/recipes/welt.recipe +++ b/resources/recipes/welt.recipe @@ -22,7 +22,7 @@ class weltDe(BasicNewsRecipe): remove_stylesheets = True remove_javascript = True encoding = 'utf-8' - html2epub_options = 'linearize_tables = True\nbase_font_size2=10' + html2epub_options = 'base_font_size=10' BasicNewsRecipe.summary_length = 100 @@ -83,10 +83,9 @@ class weltDe(BasicNewsRecipe): dict(name='div', attrs={'class':'articleOptions clear'}), dict(name='div', attrs={'class':'noPrint galleryIndex'}), dict(name='div', attrs={'class':'inlineBox inlineTagCloud'}), + dict(name='div', attrs={'class':'clear module imageGalleryBig bgColor1'}), dict(name='div', attrs={'class':'clear module writeComment bgColor1'}), dict(name='div', attrs={'class':'clear module textGallery bgColor1'}), - dict(name='div', attrs={'class':'clear module socialMedia bgColor1'}), - dict(name='div', attrs={'class':'clear module continuativeLinks'}), dict(name='div', attrs={'class':'moreArtH3'}), dict(name='div', attrs={'class':'jqmWindow'}), dict(name='div', attrs={'class':'clear gap4'}), @@ -99,7 +98,7 @@ class weltDe(BasicNewsRecipe): dict(name='div', attrs={'class':'headLineH3'}), dict(name='div', attrs={'class':'print'}), dict(name='div', attrs={'class':'clear menu'}), - dict(name='div', attrs={'class':'clear galleryContent'}), + dict(name='div', attrs={'class':'themenalarm'}), dict(name='p', attrs={'class':'jump'}), dict(name='a', attrs={'class':'commentLink'}), dict(name='h2', attrs={'class':'jumpHeading'}), @@ -110,7 +109,7 @@ class weltDe(BasicNewsRecipe): dict(name='table', attrs={'class':'textGallery'}), dict(name='li', attrs={'class':'active'})] - remove_tags_after = [dict(name='div', attrs={'class':'clear departmentLine'})] + remove_tags_after = [dict(name='div', attrs={'class':'themenalarm'})] extra_css = ''' h2{font-family:Arial,Helvetica,sans-serif; font-size: x-small; color: #003399;} @@ -122,6 +121,7 @@ class weltDe(BasicNewsRecipe): .photo {font-family:Arial,Helvetica,sans-serif; font-size: x-small; color: #666666;} ''' feeds = [ ('Politik', 'http://welt.de/politik/?service=Rss'), + ('Deutsche Dinge', 'http://www.welt.de/deutsche-dinge/?service=Rss'), ('Wirtschaft', 'http://welt.de/wirtschaft/?service=Rss'), ('Finanzen', 'http://welt.de/finanzen/?service=Rss'), ('Sport', 'http://welt.de/sport/?service=Rss'), @@ -137,3 +137,4 @@ class weltDe(BasicNewsRecipe): def print_version(self, url): return url.replace ('.html', '.html?print=true') +