Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[dbtv] Simplify, modernize, extract all formats

pull/3723/head
Sergey M․ 2014-09-05 19:53:53 +07:00
parent 1c1cff6a52
commit 4d067a58ca
1 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
youtube_dl/extractor/dbtv.py
View File

@ -4,73 +4,71 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
ExtractorError float_or_none,
int_or_none,
clean_html,
) )
class DBTVIE(InfoExtractor): class DBTVIE(InfoExtractor):
_VALID_URL = r'http://dbtv.no/(?P<id>[0-9]+)/?(?P<slug>.*)$' _VALID_URL = r'http://dbtv\.no/(?P<id>[0-9]+)#(?P<display_id>.+)'
_TEST = { _TEST = {
'url': 'http://dbtv.no/3649835190001#Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen', 'url': 'http://dbtv.no/3649835190001#Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen',
'md5': 'b89953ed25dacb6edb3ef6c6f430f8bc', 'md5': 'b89953ed25dacb6edb3ef6c6f430f8bc',
'info_dict': { 'info_dict': {
'id': '3649835190001', 'id': '33100',
'ext': 'mp4', 'display_id': 'Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen',
'title': 'Skulle teste ut fornøyelsespark, men kollegaen var bare opptatt av bikinikroppen', 'ext': 'mp4',
'description': 'md5:d681bf2bb7dd3503892cedb9c2d0e6f2', 'title': 'Skulle teste ut fornøyelsespark, men kollegaen var bare opptatt av bikinikroppen',
'thumbnail': 'http://gfx.dbtv.no/thumbs/still/33100.jpg', 'description': 'md5:1504a54606c4dde3e4e61fc97aa857e0',
'timestamp': 1404039863, 'thumbnail': 're:https?://.*\.jpg$',
'upload_date': '20140629', 'timestamp': 1404039863.438,
'duration': 69544, 'upload_date': '20140629',
'duration': 69.544,
'view_count': int,
'categories': list,
}
} }
}
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')
display_id = mobj.group('display_id')
# Download JSON file containing video info. data = self._download_json(
data = self._download_json('http://api.dbtv.no/discovery/%s' % video_id, video_id, 'Downloading media JSON') 'http://api.dbtv.no/discovery/%s' % video_id, display_id)
# We only want the first video in the JSON API file.
video = data['playlist'][0]
# Check for full HD video, else use the standard video URL video = data['playlist'][0]
for i in range(0, len(video['renditions'])):
if int(video['renditions'][i]['width']) == 1280:
video_url = video['renditions'][i]['URL']
break
else:
video_url = video['URL']
# Add access token to image or it will fail. formats = [{
thumbnail = video['splash'] 'url': f['URL'],
'vcodec': f.get('container'),
'width': int_or_none(f.get('width')),
'height': int_or_none(f.get('height')),
'vbr': float_or_none(f.get('rate'), 1000),
'filesize': int_or_none(f.get('size')),
} for f in video['renditions'] if 'URL' in f]
# Duration int. if not formats:
duration = int(video['length']) for url_key, format_id in [('URL', 'mp4'), ('HLSURL', 'hls')]:
if url_key in video:
formats.append({
'url': video[url_key],
'format_id': format_id,
})
# Timestamp is given in milliseconds. self._sort_formats(formats)
timestamp = float(str(video['publishedAt'])[0:-3])
formats = [] return {
'id': video['id'],
# Video URL. 'display_id': display_id,
if video['URL'] is not None: 'title': video['title'],
formats.append({ 'description': clean_html(video['desc']),
'url': video_url, 'thumbnail': video.get('splash') or video.get('thumb'),
'format_id': 'mp4', 'timestamp': float_or_none(video.get('publishedAt'), 1000),
'ext': 'mp4' 'duration': float_or_none(video.get('length'), 1000),
}) 'view_count': int_or_none(video.get('views')),
else: 'categories': video.get('tags'),
raise ExtractorError('No download URL found for video: %s.' % video_id, expected=True) 'formats': formats,
}
return {
'id': video_id,
'title': video['title'],
'description': video['desc'],
'thumbnail': thumbnail,
'timestamp': timestamp,
'duration': duration,
'view_count': video['views'],
'formats': formats,
}