diff --git a/recipes/business_spectator.recipe b/recipes/business_spectator.recipe deleted file mode 100644 index 31b03570f6..0000000000 --- a/recipes/business_spectator.recipe +++ /dev/null @@ -1,40 +0,0 @@ -__license__ = 'GPL v3' -__copyright__ = '2010, Dean Cording' -''' -abc.net.au/news -''' -import re -from calibre.web.feeds.recipes import BasicNewsRecipe - - -class BusinessSpectator(BasicNewsRecipe): - title = 'Business Spectator' - __author__ = 'Dean Cording' - description = 'Australian Business News & commentary delivered the way you want it.' - masthead_url = 'http://www.businessspectator.com.au/bs.nsf/logo-business-spectator.gif' - cover_url = masthead_url - - oldest_article = 2 - max_articles_per_feed = 100 - no_stylesheets = True - auto_cleanup = True - use_embedded_content = False - encoding = 'utf8' - publisher = 'Business Spectator' - category = 'News, Australia, Business' - language = 'en_AU' - publication_type = 'newsportal' - preprocess_regexps = [(re.compile(r'', re.DOTALL), lambda m: '')] - conversion_options = { - 'comments': description, 'tags': category, 'language': language, 'publisher': publisher, 'linearize_tables': False - } - - feeds = [ - ('Top Stories', 'http://www.businessspectator.com.au/top-stories.rss'), - ('Alan Kohler', 'http://www.businessspectator.com.au/bs.nsf/RSS?readform&type=spectators&cat=Alan%20Kohler'), - ('Robert Gottliebsen', 'http://www.businessspectator.com.au/bs.nsf/RSS?readform&type=spectators&cat=Robert%20Gottliebsen'), - ('Stephen Bartholomeusz', - 'http://www.businessspectator.com.au/bs.nsf/RSS?readform&type=spectators&cat=Stephen%20Bartholomeusz'), - ('Daily Dossier', 'http://www.businessspectator.com.au/bs.nsf/RSS?readform&type=kgb&cat=dossier'), - ('Australia', 'http://www.businessspectator.com.au/bs.nsf/RSS?readform&type=region&cat=australia'), - ] diff --git a/recipes/courier_mail.recipe b/recipes/courier_mail.recipe index b6a6d32c39..ae423fd1fc 100644 --- a/recipes/courier_mail.recipe +++ b/recipes/courier_mail.recipe @@ -1,30 +1,31 @@ from calibre.web.feeds.news import BasicNewsRecipe - +import datetime class Politics(BasicNewsRecipe): - title = u'Courier Mail' + title = u'The Courier-Mail' + description = 'Breaking news headlines for Brisbane and Queensland, Australia. The Courier-Mail is owned by News Corp Australia.' language = 'en_AU' - __author__ = 'Krittika Goyal' + __author__ = 'Krittika Goyal, James Cridland' oldest_article = 3 # days max_articles_per_feed = 20 use_embedded_content = False + d = datetime.datetime.today() + cover_url='http://mfeeds.news.com.au/smedia/NCCOURIER/NCCM_1_' + d.strftime('%Y_%m_%d') + '_thumb_big.jpg' + masthead_url='https://couriermail.digitaleditions.com.au/images/couriermail-logo.jpg' + no_stylesheets = True auto_cleanup = True + handle_gzip = True feeds = [ - ('Top Stories', - 'http://feeds.news.com.au/public/rss/2.0/bcm_top_stories_257.xml'), - ('Breaking News', - 'http://feeds.news.com.au/public/rss/2.0/bcm_breaking_news_67.xml'), - ('Queensland News', - 'http://feeds.news.com.au/public/rss/2.0/bcm_queensland_news_70.xml'), - ('Technology News', - 'http://feeds.news.com.au/public/rss/2.0/bcm_technology_news_66.xml'), - ('Entertainment News', - 'http://feeds.news.com.au/public/rss/2.0/bcm_entertainment_news_256.xml'), - ('Business News', - 'http://feeds.news.com.au/public/rss/2.0/bcm_business_news_64.xml'), - ('Sport News', - 'http://feeds.news.com.au/public/rss/2.0/bcm_sports_news_65.xml'), + ('Top Stories', 'http://www.couriermail.com.au/rss'), + ('Breaking', 'https://www.couriermail.com.au/news/breaking-news/rss'), + ('Queensland', 'https://www.couriermail.com.au/news/queensland/rss'), + ('Technology', 'https://www.couriermail.com.au/technology/rss'), + ('Entertainment', 'https://www.couriermail.com.au/entertainment/rss'), + ('Finance','https://www.couriermail.com.au/business/rss'), + ('Sport', 'https://www.couriermail.com.au/sport/rss'), ] + +# This isn't perfect, but works rather better than it once did. To do - remove links to subscription content. \ No newline at end of file diff --git a/recipes/icons/courier_mail.png b/recipes/icons/courier_mail.png index 9ccd38d2f3..6478f64f49 100644 Binary files a/recipes/icons/courier_mail.png and b/recipes/icons/courier_mail.png differ