Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-12-23 06:57:54 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:rg3/youtube-dl

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-10-25 09:55:05 +02:00
commit 603821161f
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
youtube_dl/extractor/nhl.py
View File

@ -22,21 +22,23 @@ class NHLBaseInfoExtractor(InfoExtractor):
self.report_extraction(video_id) self.report_extraction(video_id)
initial_video_url = info['publishPoint'] initial_video_url = info['publishPoint']
data = compat_urllib_parse.urlencode({ if info['formats'] == '1':
'type': 'fvod', data = compat_urllib_parse.urlencode({
'path': initial_video_url.replace('.mp4', '_sd.mp4'), 'type': 'fvod',
}) 'path': initial_video_url.replace('.mp4', '_sd.mp4'),
path_url = 'http://video.nhl.com/videocenter/servlets/encryptvideopath?' + data })
path_doc = self._download_xml( path_url = 'http://video.nhl.com/videocenter/servlets/encryptvideopath?' + data
path_url, video_id, 'Downloading final video url') path_doc = self._download_xml(
video_url = path_doc.find('path').text path_url, video_id, 'Downloading final video url')
video_url = path_doc.find('path').text
else:
video_url = initial_video_url
join = compat_urlparse.urljoin join = compat_urlparse.urljoin
return { return {
'id': video_id, 'id': video_id,
'title': info['name'], 'title': info['name'],
'url': video_url, 'url': video_url,
'ext': determine_ext(video_url),
'description': info['description'], 'description': info['description'],
'duration': int(info['duration']), 'duration': int(info['duration']),
'thumbnail': join(join(video_url, '/u/'), info['bigImage']), 'thumbnail': join(join(video_url, '/u/'), info['bigImage']),
@ -46,10 +48,11 @@ class NHLBaseInfoExtractor(InfoExtractor):
class NHLIE(NHLBaseInfoExtractor): class NHLIE(NHLBaseInfoExtractor):
IE_NAME = 'nhl.com' IE_NAME = 'nhl.com'
_VALID_URL = r'https?://video(?P<team>\.[^.]*)?\.nhl\.com/videocenter/console(?:\?(?:.*?[?&])?)id=(?P<id>[0-9]+)' _VALID_URL = r'https?://video(?P<team>\.[^.]*)?\.nhl\.com/videocenter/console(?:\?(?:.*?[?&])?)id=(?P<id>[0-9a-z-]+)'
_TESTS = [{ _TESTS = [{
'url': 'http://video.canucks.nhl.com/videocenter/console?catid=6?id=453614', 'url': 'http://video.canucks.nhl.com/videocenter/console?catid=6?id=453614',
'md5': 'db704a4ea09e8d3988c85e36cc892d09',
'info_dict': { 'info_dict': {
'id': '453614', 'id': '453614',
'ext': 'mp4', 'ext': 'mp4',
@ -58,6 +61,17 @@ class NHLIE(NHLBaseInfoExtractor):
'duration': 18, 'duration': 18,
'upload_date': '20131006', 'upload_date': '20131006',
}, },
}, {
'url': 'http://video.nhl.com/videocenter/console?id=2014020024-628-h',
'md5': 'd22e82bc592f52d37d24b03531ee9696',
'info_dict': {
'id': '2014020024-628-h',
'ext': 'mp4',
'title': 'Alex Galchenyuk Goal on Ray Emery (14:40/3rd)',
'description': 'Home broadcast - Montreal Canadiens at Philadelphia Flyers - October 11, 2014',
'duration': 0,
'upload_date': '20141011',
},
}, { }, {
'url': 'http://video.flames.nhl.com/videocenter/console?id=630616', 'url': 'http://video.flames.nhl.com/videocenter/console?id=630616',
'only_matching': True, 'only_matching': True,