From 4b00679b2eb99d013c45e0d9983515ff4002f9b0 Mon Sep 17 00:00:00 2001
From: James Cridland <james@cridland.net>
Date: Mon, 24 Feb 2020 10:51:40 +1000
Subject: [PATCH] Update ABC News Australia

Significant update to restore this recipe to work. Replaced logo to one being used from 2018. Rebuilt the feed list.
---
 recipes/abc_au.recipe    |  61 +++++++++++++++++++++------------------
 recipes/icons/abc_au.png | Bin 332 -> 717 bytes
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/recipes/abc_au.recipe b/recipes/abc_au.recipe
index ac21e6d730..c737371820 100644
--- a/recipes/abc_au.recipe
+++ b/recipes/abc_au.recipe
@@ -6,50 +6,55 @@ abc.net.au/news
 import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
 
-
 class ABCNews(BasicNewsRecipe):
     title = 'ABC News'
-    __author__ = 'Pat Stapleton, Dean Cording'
-    description = 'News from Australia'
-    masthead_url = 'http://www.abc.net.au/news/assets/v5/images/common/logo-news.png'
-    cover_url = 'http://www.abc.net.au/news/assets/v5/images/common/logo-news.png'
-
+    __author__ = 'Pat Stapleton, Dean Cording, James Cridland'
+    description = 'From the Australian Broadcasting Corporation. The ABC is owned and funded by the Australian Government, but is editorially independent.'
+    masthead_url = 'https://www.abc.net.au/cm/lb/8212706/data/news-logo-2017---desktop-print-data.png'
+    cover_url = 'https://www.abc.net.au/news/linkableblob/8413676/data/abc-news-og-data.jpg'
+    cover_margins = (0,20,'#000000')
     oldest_article = 2
-    max_articles_per_feed = 100
-    no_stylesheets = False
+    handle_gzip = True
+    no_stylesheets = True
     use_embedded_content = False
+    scale_news_images_to_device = True
     encoding = 'utf8'
     publisher = 'ABC News'
-    category = 'News, Australia, World'
+    category = 'Australia,News'
     language = 'en_AU'
-    publication_type = 'newsportal'
-#    preprocess_regexps     = [(re.compile(r'<!--.*?-->', re.DOTALL), lambda m: '')]
-# Remove annoying map links (inline-caption class is also used for some
-# image captions! hence regex to match maps.google)
+    publication_type = 'newspaper'
+    extra_css = '.byline{font-size:smaller;margin-bottom:10px;}.inline-caption{display:block;font-size:smaller;text-decoration: none;}'
     preprocess_regexps = [(re.compile(
-        r'<a class="inline-caption" href="http://maps\.google\.com.*?/a>', re.DOTALL), lambda m: '')]
+        r'<a class="inline-caption" href="http://maps\.google\.com.*?/a>', re.DOTALL), lambda m: '')] # Remove map links
     conversion_options = {
         'comments': description, 'tags': category, 'language': language, 'publisher': publisher, 'linearize_tables': False
     }
 
     keep_only_tags = [dict(attrs={'class': ['article section']})]
 
-    remove_tags = [dict(attrs={'class': ['related', 'tags', 'tools', 'attached-content ready',
-                                         'inline-content story left', 'inline-content map left contracted', 'published',
+    remove_tags = [dict(attrs={'class': ['inner', 'attached-content', 'authorpromo', 'related', 'tags', 'tools', 'attached-content ready',
+                                         'inline-content story left', 'inline-content map left contracted',
+                                         'inline-content full embedYouTube embedded', 'published',
                                          'story-map', 'statepromo', 'topics', ]})]
+    #inner = key points
+    #attached-content = related stories
+    #authorpromo = "Contact NameOfJournalist"
 
     remove_attributes = ['width', 'height']
 
     feeds = [
-        ('Top Stories', 'http://www.abc.net.au/news/feed/45910/rss.xml'),
-        ('Canberra', 'http://www.abc.net.au/news/feed/6910/rss.xml'),
-        ('Sydney', 'http://www.abc.net.au/news/feed/10232/rss.xml'),
-        ('Melbourne', 'http://www.abc.net.au/news/feed/21708/rss.xml'),
-        ('Brisbane', 'http://www.abc.net.au/news/feed/12858/rss.xml'),
-        ('Perth', 'feed://www.abc.net.au/news/feed/24886/rss.xml'),
-        ('Australia', 'http://www.abc.net.au/news/feed/46182/rss.xml'),
-        ('World', 'http://www.abc.net.au/news/feed/52278/rss.xml'),
-        ('Business', 'http://www.abc.net.au/news/feed/51892/rss.xml'),
-        ('Science and Technology',
-         'http://www.abc.net.au/news/feed/2298/rss.xml'),
-    ]
+        ('Top Stories', 'https://www.abc.net.au/news/feed/45910/rss.xml'),
+        ('Politics', 'https://www.abc.net.au/news/feed/51120/rss.xml'),
+        ('World', 'https://www.abc.net.au/news/feed/6497190/rss.xml'),
+        ('Business', 'https://www.abc.net.au/news/feed/51892/rss.xml'),
+        ('Analysis', 'https://www.abc.net.au/news/feed/7571224/rss.xml'),
+        ('Sport', 'https://www.abc.net.au/news/feed/2942460/rss.xml'),
+        ('Adelaide', 'https://www.abc.net.au/news/feed/8057540/rss.xml'),
+        ('Brisbane', 'https://www.abc.net.au/news/feed/12858/rss.xml'),
+        ('Canberra', 'https://www.abc.net.au/news/feed/6910/rss.xml'),
+        ('Darwin', 'https://www.abc.net.au/news/feed/8057648/rss.xml'),
+        ('Hobart', 'https://www.abc.net.au/news/feed/8054562/rss.xml'),
+        ('Melbourne', 'https://www.abc.net.au/news/feed/21708/rss.xml'),
+        ('Sydney', 'https://www.abc.net.au/news/feed/10232/rss.xml'),
+        ('Perth', 'https://www.abc.net.au/news/feed/24886/rss.xml'),
+        ]
\ No newline at end of file
diff --git a/recipes/icons/abc_au.png b/recipes/icons/abc_au.png
index 438f7c0b450777d577440a08452106d0b0c5f086..e1b14c72c9f22c70c9d7cf12f427d61ea5045236 100644
GIT binary patch
literal 717
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dys{?#OT!AzLBO?|B5eG@*Pyo~g
z0m$0XM9{d%Dk0k8hG41$ia^xEq!yiA>;`08lmz(&GyJan{`T|U9o(h%VjqMaUMtGa
zPV{wuK6_HXEBodpHC9sRP8^=moRJ!<FV7litoh{5noj1furLp|g$H<n=FaqVaSX9I
zeRfi0*=hp;7u5+YOgU-Iy}i#Z&;4L~Tc7%Jk{`!S$6v4K1ue`fJzVGB%Kg^%s91je
z@5e7MMsEF9wfxvx12;DQOXs5ROZ@xf_v_gNhrLGE{yt<|`e?U0V~S-<?CUE}Th=c3
z`+B<S8HWs~`=Yc~{sv3tok5lo*P1Hly!(=9w|vU35Sf@gmlXYMvOSnAp7k2G7i>N<
z{q3m_wMG&xZpybOiwGu*&nUkoe(%liw&mtRsT;$EXB`!rvvieEv!mWQk2u-lS*MT7
zNcvuOPd;pHwCpO|<Y<*6nLqc)Nxu5c#e9j!G_d0S%-;MT@1qur1xQuq-#y>q?Ul6Y
zz|Un)_fCIxZ^@Ht4y>7=Xnku>O^U}q)=a&Nw|I5myj{?I(b(1g^Jdwo-3G6G=NWX(
zl;h1hfA*A}{f<^$UdA(1_a;VM%T`?Qj>*$geM9uM4SDwAd<P;E+Dfk<TG-*0?ppKr
z=w;K{I=UaXar56<d1?3YQ!C%gCWkNSGF!$jw_M`XIv&aDh|+g;uf5U(Id;XLj=SAE
garddBpnBI@rsWU9uLWFNzz>RaPgg&ebxsLQ0GOlraR2}S

literal 332
zcmV-S0ki&zP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0003KNkl<Z7#Xd>
z!AcVV00!XyZF&zoMJLaB6*`nR(L>;fE|F0gmDL92XiAs^Bb-VIQewL1R;E}Xn&dJM
zbrd1KYQBQsm(ww)B^_@qNXMR<pYq>*6)kPaxG`($l67}{(Ujzqf_{6xnKGc)j9-=%
z+^}lfS9xK=B}Kmtd*rFd+Flzmq~g1(JXA7j)CViBO16zTP&I4PXCrb~Nm)}-!-D+t
z%sX|v#x)GdZDr5x8?fYugc-xu9h&mSHJMOSGwqf^Eq@$(>89&iYF6BnhJtDH>dv}s
z$9wxKx?J(mfvOzo)1&E$Ip=koHEB`V8G~NgkYw38y*4FH7xgGgj+I^TKu#>%l8!BF
e($Tgmr{XW9*$)Bdt8q^N0000<MNUMnLSTYy9F!3N