MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-27 19:36:50 +01:00
Code Issues Releases Wiki Activity

[nhl] Modernize

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-08-27 19:52:55 +02:00
parent ce6815aad3
commit 259454525f
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
youtube_dl/extractor/nhl.py
View File

@ -1,3 +1,5 @@
from __future__ import unicode_literals
import re import re
import json import json
@ -25,8 +27,8 @@ class NHLBaseInfoExtractor(InfoExtractor):
'path': initial_video_url.replace('.mp4', '_sd.mp4'), 'path': initial_video_url.replace('.mp4', '_sd.mp4'),
}) })
path_url = 'http://video.nhl.com/videocenter/servlets/encryptvideopath?' + data path_url = 'http://video.nhl.com/videocenter/servlets/encryptvideopath?' + data
path_doc = self._download_xml(path_url, video_id, path_doc = self._download_xml(
u'Downloading final video url') path_url, video_id, 'Downloading final video url')
video_url = path_doc.find('path').text video_url = path_doc.find('path').text
join = compat_urlparse.urljoin join = compat_urlparse.urljoin
@ -43,17 +45,18 @@ class NHLBaseInfoExtractor(InfoExtractor):
class NHLIE(NHLBaseInfoExtractor): class NHLIE(NHLBaseInfoExtractor):
IE_NAME = u'nhl.com' IE_NAME = 'nhl.com'
_VALID_URL = r'https?://video(?P<team>\.[^.]*)?\.nhl\.com/videocenter/console\?.*?(?<=[?&])id=(?P<id>\d+)' _VALID_URL = r'https?://video(?P<team>\.[^.]*)?\.nhl\.com/videocenter/console\?.*?(?<=[?&])id=(?P<id>\d+)'
_TEST = { _TEST = {
u'url': u'http://video.canucks.nhl.com/videocenter/console?catid=6?id=453614', 'url': 'http://video.canucks.nhl.com/videocenter/console?catid=6?id=453614',
u'file': u'453614.mp4', 'info_dict': {
u'info_dict': { 'id': '453614',
u'title': u'Quick clip: Weise 4-3 goal vs Flames', 'ext': 'mp4',
u'description': u'Dale Weise scores his first of the season to put the Canucks up 4-3.', 'title': 'Quick clip: Weise 4-3 goal vs Flames',
u'duration': 18, 'description': 'Dale Weise scores his first of the season to put the Canucks up 4-3.',
u'upload_date': u'20131006', 'duration': 18,
'upload_date': '20131006',
}, },
} }
@ -61,23 +64,23 @@ class NHLIE(NHLBaseInfoExtractor):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id') video_id = mobj.group('id')
json_url = 'http://video.nhl.com/videocenter/servlets/playlist?ids=%s&format=json' % video_id json_url = 'http://video.nhl.com/videocenter/servlets/playlist?ids=%s&format=json' % video_id
info_json = self._download_webpage(json_url, video_id, data = self._download_json(
u'Downloading info json') json_url, video_id, transform_source=self._fix_json)
info_json = self._fix_json(info_json) return self._extract_video(data[0])
info = json.loads(info_json)[0]
return self._extract_video(info)
class NHLVideocenterIE(NHLBaseInfoExtractor): class NHLVideocenterIE(NHLBaseInfoExtractor):
IE_NAME = u'nhl.com:videocenter' IE_NAME = 'nhl.com:videocenter'
IE_DESC = u'NHL videocenter category' IE_DESC = 'NHL videocenter category'
_VALID_URL = r'https?://video\.(?P<team>[^.]*)\.nhl\.com/videocenter/(console\?.*?catid=(?P<catid>[^&]+))?' _VALID_URL = r'https?://video\.(?P<team>[^.]*)\.nhl\.com/videocenter/(console\?.*?catid=(?P<catid>[^&]+))?'
_TEST = {
@classmethod 'url': 'http://video.canucks.nhl.com/videocenter/console?catid=999',
def suitable(cls, url): 'info_dict': {
if NHLIE.suitable(url): 'id': '999',
return False 'title': 'Highlights',
return super(NHLVideocenterIE, cls).suitable(url) },
'playlist_count': 12,
}
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -86,10 +89,10 @@ class NHLVideocenterIE(NHLBaseInfoExtractor):
cat_id = self._search_regex( cat_id = self._search_regex(
[r'var defaultCatId = "(.+?)";', [r'var defaultCatId = "(.+?)";',
r'{statusIndex:0,index:0,.*?id:(.*?),'], r'{statusIndex:0,index:0,.*?id:(.*?),'],
webpage, u'category id') webpage, 'category id')
playlist_title = self._html_search_regex( playlist_title = self._html_search_regex(
r'tab0"[^>]*?>(.*?)</td>', r'tab0"[^>]*?>(.*?)</td>',
webpage, u'playlist title', flags=re.DOTALL).lower().capitalize() webpage, 'playlist title', flags=re.DOTALL).lower().capitalize()
data = compat_urllib_parse.urlencode({ data = compat_urllib_parse.urlencode({
'cid': cat_id, 'cid': cat_id,
@ -104,7 +107,7 @@ class NHLVideocenterIE(NHLBaseInfoExtractor):
response = self._fix_json(response) response = self._fix_json(response)
if not response.strip(): if not response.strip():
self._downloader.report_warning(u'Got an empty reponse, trying ' self._downloader.report_warning(u'Got an empty reponse, trying '
u'adding the "newvideos" parameter') 'adding the "newvideos" parameter')
response = self._download_webpage(request_url + '&newvideos=true', response = self._download_webpage(request_url + '&newvideos=true',
playlist_title) playlist_title)
response = self._fix_json(response) response = self._fix_json(response)
@ -114,5 +117,5 @@ class NHLVideocenterIE(NHLBaseInfoExtractor):
'_type': 'playlist', '_type': 'playlist',
'title': playlist_title, 'title': playlist_title,
'id': cat_id, 'id': cat_id,
'entries': [self._extract_video(i) for i in videos], 'entries': [self._extract_video(v) for v in videos],
} }