From 959545ff5add4f976c7b7bded1346c84bda6c7b8 Mon Sep 17 00:00:00 2001
From: James Cridland <james@cridland.net>
Date: Mon, 24 Feb 2020 11:30:54 +1000
Subject: [PATCH] Updated recipe for The Courier-Mail

Added new RSS feeds, and cover image/masthead. Added a new icon.
---
 recipes/courier_mail.recipe    |  35 +++++++++++++++++----------------
 recipes/icons/courier_mail.png | Bin 512 -> 835 bytes
 2 files changed, 18 insertions(+), 17 deletions(-)

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 9ccd38d2f3734514241eaf07f05cec3aabaca18f..6478f64f4962a372ff71cc8d40f6fc353c93666f 100644
GIT binary patch
delta 824
zcmV-81IPS;1j7c97=H)?0002|8116~00Rn1L_t(|0b+P3qe@c*Xs;Zg<z}Kder$ZG
zZQHhO+qP}nwr$(CZ8x*g#!3I_<jrYbZ7qU3`d#mD3J3v0fanSEWAE>sVxoV+2LYIl
z7N4ZdNK$8Z#aM|+qEs01W~0U@iPMl288PCnj2e$5Oo^3D<bUEO!z`nQ2Vh+weRgHk
zcy-2XK374Aa;F~pww*$$id@V@T%4qM(YNj}4jmP%*8^B=&`jU9!#sOlYTKD4N-b2V
zuB}{SoIWe}>_?KO1;YoxaeSU4#(_gN&x<wcagpOlE!&&tF4&4<J$kGzS|*gMs?M0>
zn5N@6*3)O|qJO2<?K^nK$ChPn-A3c&X@`CcLtU~Q8i3&e@J5oP)wgWNthRm=l$9E_
zu%10v=PU>g8m>&73K%w!Wa+exTj(Ld{zHV)m0%DR_08M(f+f_s3mjdCXkNbRx{d+h
zKDk3TM>pJ^eFp)c@7a%cW!fyEWChQ^?ma$`^hCL9uYZ^SMwgnlb}S2`wq`xn@cE0`
zFF6m8>J0!~tgTq>?d;N%i<itea*P6?CPK~JsLov&2I&1VLM*9Sn=rrz9LE<Z@eTkU
zNCxBJVY(9`VgU66fNq}$NM#&8N_VP@mmwFas7#&t4J@GfuB~22cUn)L3YBUa2ah0y
zgo@RLGJlmZi=*L2Z14kOh6faU4*>B&Y@M)=zW<;yesUm30UYgGfStJu^To>gEa=k9
z4_NO5T)IM1X7Z&eO3XNRf-#IkN01?WzG8BRuEAlW)%lA9ISW7!2EZVA4507YOOm8v
zF0$_2<#QEc0MEZd*(xA21~M9@U`sN<P#-ypHGhbT=gE8b`J!dSI*n{ag=ni95*>%4
zD(M1c(ljo1lJKp9&tDv=X<ol+OOh>$=7mea5n}>b@<4ab&}?~w!$+H!E(Zq;CGk^0
zYpGQSXrL`$708eS1tivLfc~NH+QSzp?z4a~a1Uh6iP)m^&_;%zZ^3JS;w-$-8bmx%
z<S}#^L{QN#J&^(Y7<Zdjz5c1s@8O}pO#DKC5a1Q0to@jAiKnIj0000<MNUMnLSTXl
C{D;v1

delta 498
zcmV<O0S*4c27m;R7=Hu<0001iRA<Kk001yhOjJbxiNpY*)c~c}0H)ahrr7|c*afKC
zF}UGW#O8U?>yOy)vE=l^>h{?2`R@7s|Ns96vF<?t000McQchC=97m7C-u;)bPZ0nB
z0eDG7K~yMHWl}p#0#Oirh@mDi_EyxG7-|y}dYh|_z`O(bbbl8cp}Pu0XQ2i<5(`5|
zte_(rRJu!~fDR-g*KvTry6-@vVY{81-Pt#DLa5q0&|*h>;<t9-*8WfLg}m*2J{btE
zdQVvI4)3mO3p46>fnC{pR1^8RaqJSb?E7lRML(t}+j73@A#LN3fl#)w2C~$T@C07g
zJ?b=vUwHN9h<{*@MpFjJ3<_V0=n9gSK!Fz4i3sE>#7nwlAW2i_RD_CY8UrONGi^MG
zh;TDOQy@bY)2!#H(AtuhGu>gC@_kHT!1F+yW<bR#LIEX~Iim$o0|Q!{=Nrh>S*8sh
z2{-wxgM5L?(g80G6``}tLz=9(1(pruOxSbu667SyI%^;1OIfJUc~#OZV<h=>uRcMJ
zZcKESmniV#Ja|QlI_mg04EgzNkd>e>b-a^Q1}O_AO~B$-%e7FM-0FeFYb%pg40e?r
owAV4XL4EuUY9q?cu>buI-xa^~D(={<ivR!s07*qoM6N<$g1GhSiU0rr