From 712258df81e07c746962c6e47f694ef81eedadd8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 29 Dec 2019 18:10:25 +0530 Subject: [PATCH] http -> https and remove some non-working recipes --- recipes/dagens_industri.recipe | 2 +- recipes/dn_se.recipe | 12 +++---- recipes/ekot.recipe | 10 +++--- recipes/fria.recipe | 64 ---------------------------------- recipes/svd_se.recipe | 48 ------------------------- 5 files changed, 12 insertions(+), 124 deletions(-) delete mode 100644 recipes/fria.recipe delete mode 100644 recipes/svd_se.recipe diff --git a/recipes/dagens_industri.recipe b/recipes/dagens_industri.recipe index fa0ddd1def..cb69060e67 100644 --- a/recipes/dagens_industri.recipe +++ b/recipes/dagens_industri.recipe @@ -19,7 +19,7 @@ class AdvancedUserRecipe1311450855(BasicNewsRecipe): encoding = 'utf-8' language = 'sv' - feeds = [(u'DI', u'http://di.se/rss')] + feeds = [(u'DI', u'https://di.se/rss')] keep_only_tags = [dict(name='h1', attrs={'id': 'ctl00_ExtraWideContentRegion_WideContentRegion_MainRegion_MainContentRegion_MainBodyRegion_headlineNormal'}), dict( name='div', attrs={'id': 'articleBody'})] # noqa diff --git a/recipes/dn_se.recipe b/recipes/dn_se.recipe index 16b2b833b7..138c64d27c 100644 --- a/recipes/dn_se.recipe +++ b/recipes/dn_se.recipe @@ -28,12 +28,12 @@ class DN_se(BasicNewsRecipe): feeds = [ - (u'Nyheter', u'http://www.dn.se/m/rss/toppnyheter'), - (u'Ekonomi', u'http://www.dn.se/ekonomi-rss'), - (u'Sport', u'http://www.dn.se/sport-rss'), - (u'Debatt', u'http://www.dn.se/debatt-rss'), - (u'Ledare', u'http://www.dn.se/ledare-rss'), - (u'Kultur', u'http://www.dn.se/kultur-rss') + (u'Nyheter', u'https://www.dn.se/m/rss/toppnyheter'), + (u'Ekonomi', u'https://www.dn.se/ekonomi-rss'), + (u'Sport', u'https://www.dn.se/sport-rss'), + (u'Debatt', u'https://www.dn.se/debatt-rss'), + (u'Ledare', u'https://www.dn.se/ledare-rss'), + (u'Kultur', u'https://www.dn.se/kultur-rss') ] keep_only_tags = [dict(name='div', attrs={'id': 'article-content'})] diff --git a/recipes/ekot.recipe b/recipes/ekot.recipe index 547d45ef64..7651bc458b 100644 --- a/recipes/ekot.recipe +++ b/recipes/ekot.recipe @@ -28,10 +28,10 @@ class Ekot_SE(BasicNewsRecipe): name='span', attrs={'class': 'relLink'}) ] - feeds = [(u'Ekot', u'http://api.sr.se/api/rssfeed/rssfeed.aspx?rssfeed=83'), - (u'Utrikes', u'http://api.sr.se/api/rssfeed/rssfeed.aspx?rssfeed=3304'), - (u'Radiosporten', u'http://api.sr.se/api/rssfeed/rssfeed.aspx?rssfeed=179')] + feeds = [(u'Ekot', u'https://api.sr.se/api/rssfeed/rssfeed.aspx?rssfeed=83'), + (u'Utrikes', u'https://api.sr.se/api/rssfeed/rssfeed.aspx?rssfeed=3304'), + (u'Radiosporten', u'https://api.sr.se/api/rssfeed/rssfeed.aspx?rssfeed=179')] def print_version(self, url): - return url.replace('http://sverigesradio.se/cgi-bin/ekot/artikel.asp', - 'http://sverigesradio.se/cgi-bin/isidorpub/PrinterFriendlyArticle.asp') + '&ProgramID=83' + return url.replace('https://sverigesradio.se/cgi-bin/ekot/artikel.asp', + 'https://sverigesradio.se/cgi-bin/isidorpub/PrinterFriendlyArticle.asp') + '&ProgramID=83' diff --git a/recipes/fria.recipe b/recipes/fria.recipe deleted file mode 100644 index 364678db61..0000000000 --- a/recipes/fria.recipe +++ /dev/null @@ -1,64 +0,0 @@ -from calibre.web.feeds.news import BasicNewsRecipe - - -class FriaTidningen_SE(BasicNewsRecipe): - title = u'Fria Tidningen' - __author__ = 'Joakim Lindskog' - description = 'Nyheter fr\xc3\xa5n Fria Tidningen' - publisher = 'Fria Tidningen' - category = 'news, politics, Sweden' - oldest_article = 7 - delay = 1 - max_articles_per_feed = 100 - no_stylesheets = True - use_embedded_content = False - encoding = 'utf-8' - language = 'sv' - - conversion_options = { - 'comment': description, 'tags': category, 'publisher': publisher, 'language': language - } - - keep_only_tags = [dict(name='div', attrs={'id': 'content-area'})] - remove_tags_before = dict(name='div', attrs={'id': 'content-area'}) - remove_tags_after = dict(name='div', attrs={'id': 'byline'}) - remove_tags = [ - dict(name=['object', 'link', 'base']), - dict(name='div', attrs={'id': 'comments'}), - dict(name='div', attrs={'id': 'block-block-21'}), - dict(name='div', attrs={'id': 'block-block-22'}), - dict(name='div', attrs={'id': 'block-block-23'}), - dict(name='div', attrs={'id': 'block-block-24'}), - dict(name='div', attrs={'id': 'block-block-25'}), - dict(name='div', attrs={'id': 'block-block-26'}), - dict(name='div', attrs={'id': 'block-block-27'}), - dict(name='div', attrs={'id': 'block-block-28'}), - dict(name='div', attrs={'id': 'block-block-29'}), - dict(name='div', attrs={'id': 'block-block-30'}), - dict(name='div', attrs={'id': 'block-block-40'}) - ] - - feeds = [(u'Allt', u'http://www.fria.nu/feed'), - (u'Nyheter', u'http://www.fria.nu/taxonomy/term/13/feed/feed'), - (u'Inrikes', u'http://www.fria.nu/taxonomy/term/14/0/feed'), - (u'Utrikes', u'http://www.fria.nu/taxonomy/term/15/0/feed'), - (u'Ekonomi', u'http://www.fria.nu/taxonomy/term/27047/0/feed'), - (u'Opinion', u'http://www.fria.nu/taxonomy/term/22/0/feed'), - (u'Inledaren', u'http://www.fria.nu/taxonomy/term/24/0/feed'), - (u'Argument', u'http://www.fria.nu/taxonomy/term/23/0/feed'), - (u'Synpunkten', u'http://www.fria.nu/taxonomy/term/26/0/feed'), - (u'Debatt', u'http://www.fria.nu/taxonomy/term/25/0/feed'), - (u'Kultur', u'http://www.fria.nu/taxonomy/term/19/0/feed'), - (u'Kulturnyheter', u'http://www.fria.nu/taxonomy/term/24534/0/feed'), - (u'Recensioner', u'http://www.fria.nu/taxonomy/term/24535/0/feed'), - (u'BAK', u'http://www.fria.nu/taxonomy/term/27/0/feed'), - (u'Sport & H\xc3\xa4lsa' u'http://www.fria.nu/taxonomy/term/27215/0/feed'), - (u'Sport', u'http://www.fria.nu/taxonomy/term/20/0/feed'), - (u'H\xc3\xa4lsa', u'http://www.fria.nu/taxonomy/term/21/0/feed'), - (u'F\xc3\xb6rdjupning', u'http://www.fria.nu/taxonomy/term/24994/0/feed'), - (u'Fokus', u'http://www.fria.nu/taxonomy/term/24864/0/feed'), - (u'Samtal', u'http://www.fria.nu/taxonomy/term/28/0/feed'), - (u'Stockholm', u'http://www.fria.nu/taxonomy/term/122/0/feed'), - (u'G\xc3\xb6teborg', u'http://www.fria.nu/taxonomy/term/73/0/feed'), - (u'Uppsala', u'http://www.fria.nu/taxonomy/term/27324/0/feed'), - (u'Malm\xc3\xb6', u'http://www.fria.nu/taxonomy/term/28031/0/feed')] diff --git a/recipes/svd_se.recipe b/recipes/svd_se.recipe deleted file mode 100644 index ce15cd10be..0000000000 --- a/recipes/svd_se.recipe +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python2 - -__license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' -''' -svd.se -''' -from calibre.web.feeds.news import BasicNewsRecipe - - -class SVD_se(BasicNewsRecipe): - title = 'Svenska Dagbladet' - __author__ = 'Darko Miletic' - description = 'News from Sweden' - publisher = 'Svenska Dagbladet' - category = 'news, politics, Sveden' - oldest_article = 2 - delay = 1 - max_articles_per_feed = 100 - no_stylesheets = True - use_embedded_content = False - encoding = 'utf-8' - language = 'sv' - - conversion_options = { - 'comment': description, 'tags': category, 'publisher': publisher, 'language': language - } - - feeds = [ - - (u'Toppnyheter', u'http://www.svd.se/?service=rss'), - (u'Inrikes', u'http://www.svd.se/nyheter/inrikes/?service=rss'), - (u'Utrikes', u'http://www.svd.se/nyheter/utrikes/?service=rss'), - (u'Politik', u'http://www.svd.se/nyheter/politik/?service=rss'), - (u'Idagsidan ', u'http://www.svd.se/nyheter/idagsidan/?service=rss'), - (u'Vetenskap', u'http://www.svd.se/nyheter/vetenskap/?service=rss'), - (u'Sport', u'http://www.svd.se/sportspel/nyheter/?service=rss'), - (u'Opinion', u'http://www.svd.se/opinion/startsidan/?service=rss'), - (u'Kultur', u'http://www.svd.se/kulturnoje/nyheter/?service=rss') - ] - - keep_only_tags = [ - dict(name='div', attrs={'id': ['article-content', 'articlecontent']})] - remove_tags_after = dict(name='div', attrs={'class': 'articlebody'}) - remove_tags = [ - dict(name=['object', 'link', 'base']), dict(name='div', attrs={'class': ['articlead', 'factcolumn', 'article-ad']}), dict( - name='ul', attrs={'class': 'toolbar articletop clearfix'}), dict(name='p', attrs={'class': 'more'}) - ]