From 21221d0d923bde5796a2b715fa0987511410226c Mon Sep 17 00:00:00 2001
From: David Hood <30076632+davidphood@users.noreply.github.com>
Date: Thu, 2 May 2019 23:22:37 +1000
Subject: [PATCH] Only match on unambiguous urls - this removes the overly
 restrictive <id>. urls containing programs/<series>/<id> are still used since
 they are returned by the series json info.

---
 youtube_dl/extractor/abc.py | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py
index 1542e3503..29d284086 100644
--- a/youtube_dl/extractor/abc.py
+++ b/youtube_dl/extractor/abc.py
@@ -105,7 +105,7 @@ class ABCIE(InfoExtractor):
 
 class ABCIViewIE(InfoExtractor):
     IE_NAME = 'abc.net.au:iview'
-    _VALID_URL = r'https?://iview\.abc\.net\.au/(?:(?:[^/]+/)*video/|programs/(?:[^/]+/)*)(?P<id>[A-Z0-9]+)'
+    _VALID_URL = r'https?://iview\.abc\.net\.au/(?:programs/[^/]+/|(?:[^/]+/)*video/)(?P<id>[^/?#]+)/?'
     _GEO_COUNTRIES = ['AU']
 
     # ABC iview programs are normally available for 14 days only.
@@ -125,22 +125,6 @@ class ABCIViewIE(InfoExtractor):
             'skip_download': True,
         },
     },
-    {
-        'url': 'https://iview.abc.net.au/programs/CK1752H001S00',
-        'info_dict': {
-            'id': 'CK1752H001S00',
-            'ext': 'mp4',
-            'title': "Emma Alberici: Guess How Much I Love You (Italian)",
-            'series': "Play School Story Time: Languages",
-            'description': 'md5:b61ce34edc946e109e76c7432db5d91f',
-            'upload_date': '20171204',
-            'uploader_id': 'abc4kids',
-            'timestamp': 1512414300,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    },
     {
         'url': 'https://iview.abc.net.au/programs/play-school-story-time-languages/CK1752H001S00',
         'info_dict': {
@@ -237,18 +221,9 @@ class ABCIViewIE(InfoExtractor):
 
 class ABCIViewShowIE(ABCIViewIE):
     IE_NAME = 'abc.net.au:iview:show'
-    _VALID_URL = r'https?://iview\.abc\.net\.au/(?:show|programs)/(?P<id>[a-z0-9\-]+)/?'
+    _VALID_URL = r'https?://iview\.abc\.net\.au/show/(?P<id>[^/?#]+)/?'
 
     _TESTS = [
-        {
-            'url': 'https://iview.abc.net.au/programs/play-school-celebrity-covers',
-            'info_dict': {
-                'title': "Play School Celebrity Covers",
-                'description': 'md5:5cf7b4e466b72ee1b930fc95b2a80ed7',
-                'uploader_id': 'abc4kids',
-            },
-            'playlist_count': 31
-        },
         {
             'url': 'https://iview.abc.net.au/show/play-school-story-time',
             'info_dict': {