From a28ccbabc60c81016c851ae46365be377ea83795 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Tue, 31 Mar 2015 02:21:27 +0800 Subject: [Yahoo/NBCSports] Fix #5226 --- youtube_dl/extractor/yahoo.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'youtube_dl/extractor/yahoo.py') diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index 97dbac4cc..6e72f1e55 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -129,6 +129,15 @@ class YahooIE(InfoExtractor): }, { 'url': 'https://gma.yahoo.com/pizza-delivery-man-surprised-huge-tip-college-kids-195200785.html', 'only_matching': True, + }, { + 'note': 'NBC Sports embeds', + 'url': 'http://sports.yahoo.com/blogs/ncaab-the-dagger/tyler-kalinoski-s-buzzer-beater-caps-davidson-s-comeback-win-185609842.html?guid=nbc_cbk_davidsonbuzzerbeater_150313', + 'info_dict': { + 'id': '9CsDKds0kvHI', + 'ext': 'flv', + 'description': 'md5:df390f70a9ba7c95ff1daace988f0d8d', + 'title': 'Tyler Kalinoski hits buzzer-beater to lift Davidson', + } } ] @@ -151,6 +160,11 @@ class YahooIE(InfoExtractor): items = json.loads(items_json) video_id = items[0]['id'] return self._get_info(video_id, display_id, webpage) + # Look for NBCSports iframes + iframe_m = re.search( + r']+src="(?Phttps?://vplayer\.nbcsports\.com/[^"]+)"', webpage) + if iframe_m: + return self.url_result(iframe_m.group('url'), 'NBCSports') items_json = self._search_regex( r'mediaItems: ({.*?})$', webpage, 'items', flags=re.MULTILINE, -- cgit v1.2.3 From a2a4d5fa313d5244d24fa70d5db91971a7583d79 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Tue, 31 Mar 2015 02:47:18 +0800 Subject: [Yahoo/NBCSports] Generalize NBC sports info extractor --- youtube_dl/extractor/yahoo.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'youtube_dl/extractor/yahoo.py') diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index 6e72f1e55..43776d1e6 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -17,6 +17,8 @@ from ..utils import ( int_or_none, ) +from .nbc import NBCSportsVPlayerIE + class YahooIE(InfoExtractor): IE_DESC = 'Yahoo screen and movies' @@ -132,6 +134,7 @@ class YahooIE(InfoExtractor): }, { 'note': 'NBC Sports embeds', 'url': 'http://sports.yahoo.com/blogs/ncaab-the-dagger/tyler-kalinoski-s-buzzer-beater-caps-davidson-s-comeback-win-185609842.html?guid=nbc_cbk_davidsonbuzzerbeater_150313', + 'md5': 'ceae8dced5c14a1c1ffcb7a32194cca5', 'info_dict': { 'id': '9CsDKds0kvHI', 'ext': 'flv', @@ -161,10 +164,9 @@ class YahooIE(InfoExtractor): video_id = items[0]['id'] return self._get_info(video_id, display_id, webpage) # Look for NBCSports iframes - iframe_m = re.search( - r']+src="(?Phttps?://vplayer\.nbcsports\.com/[^"]+)"', webpage) - if iframe_m: - return self.url_result(iframe_m.group('url'), 'NBCSports') + nbc_sports_url = NBCSportsVPlayerIE._extract_url(webpage) + if nbc_sports_url: + return self.url_result(nbc_sports_url, 'NBCSportsVPlayer') items_json = self._search_regex( r'mediaItems: ({.*?})$', webpage, 'items', flags=re.MULTILINE, -- cgit v1.2.3 From e15307a612ea588b504f1f03ba0201612df66b35 Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Tue, 31 Mar 2015 13:13:29 +0800 Subject: [NBCSports/Yahoo] Comment out some MD5 checksums They seems to change constantly --- youtube_dl/extractor/yahoo.py | 1 - 1 file changed, 1 deletion(-) (limited to 'youtube_dl/extractor/yahoo.py') diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dl/extractor/yahoo.py index 43776d1e6..b777159c5 100644 --- a/youtube_dl/extractor/yahoo.py +++ b/youtube_dl/extractor/yahoo.py @@ -134,7 +134,6 @@ class YahooIE(InfoExtractor): }, { 'note': 'NBC Sports embeds', 'url': 'http://sports.yahoo.com/blogs/ncaab-the-dagger/tyler-kalinoski-s-buzzer-beater-caps-davidson-s-comeback-win-185609842.html?guid=nbc_cbk_davidsonbuzzerbeater_150313', - 'md5': 'ceae8dced5c14a1c1ffcb7a32194cca5', 'info_dict': { 'id': '9CsDKds0kvHI', 'ext': 'flv', -- cgit v1.2.3