Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-10 22:17:20 +08:00
Code Issues Releases Wiki Activity

Only match on unambiguous urls - this removes the overly restrictive <id>.

Browse Source 
urls containing programs/<series>/<id> are still used since they are
returned by the series json info.
This commit is contained in:
David Hood 2019-05-02 23:22:37 +10:00
parent 2e0f5efcf1
commit 21221d0d92
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
youtube_dl/extractor/abc.py
View File

@ -105,7 +105,7 @@ class ABCIE(InfoExtractor):
class ABCIViewIE(InfoExtractor): class ABCIViewIE(InfoExtractor):
IE_NAME = 'abc.net.au:iview' 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'] _GEO_COUNTRIES = ['AU']
# ABC iview programs are normally available for 14 days only. # ABC iview programs are normally available for 14 days only.
@ -125,22 +125,6 @@ class ABCIViewIE(InfoExtractor):
'skip_download': True, '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', 'url': 'https://iview.abc.net.au/programs/play-school-story-time-languages/CK1752H001S00',
'info_dict': { 'info_dict': {
@ -237,18 +221,9 @@ class ABCIViewIE(InfoExtractor):
class ABCIViewShowIE(ABCIViewIE): class ABCIViewShowIE(ABCIViewIE):
IE_NAME = 'abc.net.au:iview:show' 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 = [ _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', 'url': 'https://iview.abc.net.au/show/play-school-story-time',
'info_dict': { 'info_dict': {