R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[nhl:news] Add support for iframe embeds (Closes #6941)

Browse Source
This commit is contained in:
Sergey M․ 2015-09-24 23:54:16 +06:00
parent 9fbd4b35a2
commit 9c58885c70
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube_dl/extractor/nhl.py
View File

@ -149,9 +149,9 @@ class NHLIE(NHLBaseInfoExtractor):
class NHLNewsIE(NHLBaseInfoExtractor): class NHLNewsIE(NHLBaseInfoExtractor):
IE_NAME = 'nhl.com:news' IE_NAME = 'nhl.com:news'
IE_DESC = 'NHL news' IE_DESC = 'NHL news'
_VALID_URL = r'https?://(?:www\.)?nhl\.com/ice/news\.html?(?:\?(?:.*?[?&])?)id=(?P<id>[-0-9a-zA-Z]+)' _VALID_URL = r'https?://(?:.+?\.)?nhl\.com/(?:ice|club)/news\.html?(?:\?(?:.*?[?&])?)id=(?P<id>[-0-9a-zA-Z]+)'
_TEST = { _TESTS = [{
'url': 'http://www.nhl.com/ice/news.htm?id=750727', 'url': 'http://www.nhl.com/ice/news.htm?id=750727',
'md5': '4b3d1262e177687a3009937bd9ec0be8', 'md5': '4b3d1262e177687a3009937bd9ec0be8',
'info_dict': { 'info_dict': {
@ -162,13 +162,26 @@ class NHLNewsIE(NHLBaseInfoExtractor):
'duration': 37, 'duration': 37,
'upload_date': '20150128', 'upload_date': '20150128',
}, },
} }, {
# iframe embed
'url': 'http://sabres.nhl.com/club/news.htm?id=780189',
'md5': '9f663d1c006c90ac9fb82777d4294e12',
'info_dict': {
'id': '836127',
'ext': 'mp4',
'title': 'Morning Skate: OTT vs. BUF (9/23/15)',
'description': "Brian Duff chats with Tyler Ennis prior to Buffalo's first preseason home game.",
'duration': 93,
'upload_date': '20150923',
},
}]
def _real_extract(self, url): def _real_extract(self, url):
news_id = self._match_id(url) news_id = self._match_id(url)
webpage = self._download_webpage(url, news_id) webpage = self._download_webpage(url, news_id)
video_id = self._search_regex( video_id = self._search_regex(
[r'pVid(\d+)', r"nlid\s*:\s*'(\d+)'"], [r'pVid(\d+)', r"nlid\s*:\s*'(\d+)'",
r'<iframe[^>]+src=["\']https?://video.*?\.nhl\.com/videocenter/embed\?.*\bplaylist=(\d+)'],
webpage, 'video id') webpage, 'video id')
return self._real_extract_video(video_id) return self._real_extract_video(video_id)