From 8ff6324d65889d37a0c3385f8148dfd0165d242b Mon Sep 17 00:00:00 2001 From: Wang Date: Tue, 21 Apr 2020 01:17:20 +0800 Subject: [PATCH 1/4] Added fix for issue #24503 in espn.py --- youtube_dl/extractor/espn.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/espn.py b/youtube_dl/extractor/espn.py index 6cf05e6da..96f9960d1 100644 --- a/youtube_dl/extractor/espn.py +++ b/youtube_dl/extractor/espn.py @@ -20,7 +20,7 @@ class ESPNIE(OnceIE): (?: (?:(?:\w+\.)+)?espn\.go| (?:www\.)?espn - )\.com/ + )\.co(m|\.uk)/ (?: (?: video/(?:clip|iframe/twitter)| @@ -72,7 +72,7 @@ class ESPNIE(OnceIE): 'url': 'https://cdn.espn.go.com/video/clip/_/id/19771774', 'only_matching': True, }, { - 'url': 'http://www.espn.com/watch/player?id=19141491', + 'url': ' ', 'only_matching': True, }, { 'url': 'http://www.espn.com/watch/player?bucketId=257&id=19505875', @@ -98,6 +98,15 @@ class ESPNIE(OnceIE): }, { 'url': 'http://www.espn.com/espnw/video/26066627/arkansas-gibson-completes-hr-cycle-four-innings', 'only_matching': True, + },{ + 'url': 'https://www.espn.co.uk/video/clip/_/id/25103188', + 'only_matching': True, + },{ + 'url': 'https://www.espn.co.uk/video/clip/_/id/29069602', + 'only_matching': True, + },{ + 'url': 'https://www.espn.co.uk/video/clip/_/id/19367162', + 'only_matching': True, }] def _real_extract(self, url): From b466ffb5473eb98e33414fcdf38863b7842a0621 Mon Sep 17 00:00:00 2001 From: Wang Date: Tue, 21 Apr 2020 01:19:01 +0800 Subject: [PATCH 2/4] Added fix for issue #10687 in abc.py --- youtube_dl/extractor/abc.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index 6637f4f35..f659fdd7d 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -17,7 +17,6 @@ from ..utils import ( update_url_query, ) - class ABCIE(InfoExtractor): IE_NAME = 'abc.net.au' _VALID_URL = r'https?://(?:www\.)?abc\.net\.au/news/(?:[^/]+/){1,2}(?P\d+)' @@ -58,7 +57,11 @@ class ABCIE(InfoExtractor): }, { 'url': 'http://www.abc.net.au/news/2015-10-19/6866214', 'only_matching': True, - }] + }, { + 'url': "https://www.abc.net.au/news/2015-08-17/warren-entsch-introduces-same-sex-marriage-bill/6702326", + 'only_matching': True, + } + ] def _real_extract(self, url): video_id = self._match_id(url) @@ -67,8 +70,16 @@ class ABCIE(InfoExtractor): mobj = re.search( r'inline(?PVideo|Audio|YouTube)Data\.push\((?P[^)]+)\);', webpage) + + youtube_link = self._html_search_regex(r'(?s)a href="http://www.youtube.com/(.+?)"', webpage, 'youtube_link', None) + if youtube_link: + youtube_link = "http://www.youtube.com/"+youtube_link + return self.url_result(youtube_link) + if mobj is None: expired = self._html_search_regex(r'(?s)class="expired-(?:video|audio)".+?(.+?)', webpage, 'expired', None) + + if expired: raise ExtractorError('%s said: %s' % (self.IE_NAME, expired), expected=True) raise ExtractorError('Unable to extract video urls') @@ -79,6 +90,7 @@ class ABCIE(InfoExtractor): if not isinstance(urls_info, list): urls_info = [urls_info] + if mobj.group('type') == 'YouTube': return self.playlist_result([ self.url_result(url_info['url']) for url_info in urls_info]) From 5949ac43a867896cf727ba0cf69b6b6b91cda767 Mon Sep 17 00:00:00 2001 From: Wang Date: Tue, 21 Apr 2020 09:26:38 +0800 Subject: [PATCH 3/4] Fixed issues #24503 #10687 and checked style with flake8 --- youtube_dl/extractor/abc.py | 5 ++--- youtube_dl/extractor/espn.py | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index f659fdd7d..dd216fc09 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -17,6 +17,7 @@ from ..utils import ( update_url_query, ) + class ABCIE(InfoExtractor): IE_NAME = 'abc.net.au' _VALID_URL = r'https?://(?:www\.)?abc\.net\.au/news/(?:[^/]+/){1,2}(?P\d+)' @@ -73,12 +74,11 @@ class ABCIE(InfoExtractor): youtube_link = self._html_search_regex(r'(?s)a href="http://www.youtube.com/(.+?)"', webpage, 'youtube_link', None) if youtube_link: - youtube_link = "http://www.youtube.com/"+youtube_link + youtube_link = "http://www.youtube.com/" + youtube_link return self.url_result(youtube_link) if mobj is None: expired = self._html_search_regex(r'(?s)class="expired-(?:video|audio)".+?(.+?)', webpage, 'expired', None) - if expired: raise ExtractorError('%s said: %s' % (self.IE_NAME, expired), expected=True) @@ -90,7 +90,6 @@ class ABCIE(InfoExtractor): if not isinstance(urls_info, list): urls_info = [urls_info] - if mobj.group('type') == 'YouTube': return self.playlist_result([ self.url_result(url_info['url']) for url_info in urls_info]) diff --git a/youtube_dl/extractor/espn.py b/youtube_dl/extractor/espn.py index 96f9960d1..43bd767ea 100644 --- a/youtube_dl/extractor/espn.py +++ b/youtube_dl/extractor/espn.py @@ -98,13 +98,13 @@ class ESPNIE(OnceIE): }, { 'url': 'http://www.espn.com/espnw/video/26066627/arkansas-gibson-completes-hr-cycle-four-innings', 'only_matching': True, - },{ + }, { 'url': 'https://www.espn.co.uk/video/clip/_/id/25103188', 'only_matching': True, - },{ + }, { 'url': 'https://www.espn.co.uk/video/clip/_/id/29069602', 'only_matching': True, - },{ + }, { 'url': 'https://www.espn.co.uk/video/clip/_/id/19367162', 'only_matching': True, }] From d53f959a721a45d68e665f40c2ae748f2f61717a Mon Sep 17 00:00:00 2001 From: Wang Date: Tue, 21 Apr 2020 11:01:35 +0800 Subject: [PATCH 4/4] removed additional tests --- youtube_dl/extractor/abc.py | 6 +----- youtube_dl/extractor/espn.py | 9 --------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index dd216fc09..bd1172655 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -58,11 +58,7 @@ class ABCIE(InfoExtractor): }, { 'url': 'http://www.abc.net.au/news/2015-10-19/6866214', 'only_matching': True, - }, { - 'url': "https://www.abc.net.au/news/2015-08-17/warren-entsch-introduces-same-sex-marriage-bill/6702326", - 'only_matching': True, - } - ] + }] def _real_extract(self, url): video_id = self._match_id(url) diff --git a/youtube_dl/extractor/espn.py b/youtube_dl/extractor/espn.py index 43bd767ea..e6641acad 100644 --- a/youtube_dl/extractor/espn.py +++ b/youtube_dl/extractor/espn.py @@ -98,15 +98,6 @@ class ESPNIE(OnceIE): }, { 'url': 'http://www.espn.com/espnw/video/26066627/arkansas-gibson-completes-hr-cycle-four-innings', 'only_matching': True, - }, { - 'url': 'https://www.espn.co.uk/video/clip/_/id/25103188', - 'only_matching': True, - }, { - 'url': 'https://www.espn.co.uk/video/clip/_/id/29069602', - 'only_matching': True, - }, { - 'url': 'https://www.espn.co.uk/video/clip/_/id/19367162', - 'only_matching': True, }] def _real_extract(self, url):