Madeorsk
/
youtube-dl
mirror of https://codeberg.org/polarisfm/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity

[discovery] Extract more info and simplify

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-01-27 12:41:30 +01:00
parent 96d7b8873a
commit 9b05bd42e5
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
youtube_dl/extractor/discovery.py
View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
import re import re
import json import json
from .common import InfoExtractor from .common import InfoExtractor
@ -9,32 +10,37 @@ class DiscoveryIE(InfoExtractor):
_VALID_URL = r'http://dsc\.discovery\.com\/[a-zA-Z0-9\-]*/[a-zA-Z0-9\-]*/videos/(?P<id>[a-zA-Z0-9\-]*)(.htm)?' _VALID_URL = r'http://dsc\.discovery\.com\/[a-zA-Z0-9\-]*/[a-zA-Z0-9\-]*/videos/(?P<id>[a-zA-Z0-9\-]*)(.htm)?'
_TEST = { _TEST = {
'url': 'http://dsc.discovery.com/tv-shows/mythbusters/videos/mission-impossible-outtakes.htm', 'url': 'http://dsc.discovery.com/tv-shows/mythbusters/videos/mission-impossible-outtakes.htm',
'file': 'mission-impossible-outtakes.mp4', 'file': '614784.mp4',
'md5': 'e12614f9ee303a6ccef415cb0793eba2', 'md5': 'e12614f9ee303a6ccef415cb0793eba2',
'info_dict': { 'info_dict': {
'title': 'MythBusters: Mission Impossible Outtakes' 'title': 'MythBusters: Mission Impossible Outtakes',
} 'description': ('Watch Jamie Hyneman and Adam Savage practice being'
' each other -- to the point of confusing Jamie\'s dog -- and '
'don\'t miss Adam moon-walking as Jamie ... behind Jamie\'s'
' back.'),
'duration': 156,
},
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id') video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
title = self._search_regex(
r'(?<=\"name\": ")(?P<title>.*?)(?=\"\,)', webpage, r'Filename') video_list_json = self._search_regex(r'var videoListJSON = ({.*?});',
duration = int(self._search_regex( webpage, 'video list', flags=re.DOTALL)
r'(?<=\"duration\"\: )(?P<duration>.*?)(?=,)', webpage, r'Duration')) video_list = json.loads(video_list_json)
formats_raw = self._search_regex( info = video_list['clips'][0]
r'(?<=\"mp4\":)(.*?)(}])', webpage, r'formats') + '}]'
formats_json = json.loads(formats_raw)
formats = [] formats = []
for f in formats_json: for f in info['mp4']:
formats.append( formats.append(
{'url': f['src'], r'ext': r'mp4', 'tbr': int(f['bitrate'][:-1])}) {'url': f['src'], r'ext': r'mp4', 'tbr': int(f['bitrate'][:-1])})
return { return {
'id': video_id, 'id': info['contentId'],
'duration': duration, 'title': video_list['name'],
'title': title, 'formats': formats,
'formats': formats 'description': info['videoCaption'],
'thumbnail': info.get('videoStillURL') or info.get('thumbnailURL'),
'duration': info['duration'],
} }