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

[viddler] Modernize

This commit is contained in:
Sergey M․ 2015-01-28 22:49:42 +06:00
parent aad9556414
commit b04fbd789c
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
youtube_dl/extractor/viddler.py
View File

@ -13,43 +13,43 @@ from ..compat import (
class ViddlerIE(InfoExtractor): class ViddlerIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?viddler\.com/(?:v|embed|player)/(?P<id>[a-z0-9]+)' _VALID_URL = r'https?://(?:www\.)?viddler\.com/(?:v|embed|player)/(?P<id>[a-z0-9]+)'
_TESTS = [{ _TESTS = [{
"url": "http://www.viddler.com/v/43903784", 'url': 'http://www.viddler.com/v/43903784',
'md5': 'ae43ad7cb59431ce043f0ff7fa13cbf4', 'md5': 'ae43ad7cb59431ce043f0ff7fa13cbf4',
'info_dict': { 'info_dict': {
'id': '43903784', 'id': '43903784',
'ext': 'mp4', 'ext': 'mp4',
"title": "Video Made Easy", 'title': 'Video Made Easy',
'description': 'You don\'t need to be a professional to make high-quality video content. Viddler provides some quick and easy tips on how to produce great video content with limited resources. ', 'description': 'md5:6a697ebd844ff3093bd2e82c37b409cd',
"uploader": "viddler", 'uploader': 'viddler',
'timestamp': 1335371429, 'timestamp': 1335371429,
'upload_date': '20120425', 'upload_date': '20120425',
"duration": 100.89, 'duration': 100.89,
'thumbnail': 're:^https?://.*\.jpg$', 'thumbnail': 're:^https?://.*\.jpg$',
'view_count': int, 'view_count': int,
'categories': ['video content', 'high quality video', 'video made easy', 'how to produce video with limited resources', 'viddler'], 'categories': ['video content', 'high quality video', 'video made easy', 'how to produce video with limited resources', 'viddler'],
} }
}, { }, {
"url": "http://www.viddler.com/v/4d03aad9/", 'url': 'http://www.viddler.com/v/4d03aad9/',
"file": "4d03aad9.mp4", 'md5': 'faa71fbf70c0bee7ab93076fd007f4b0',
"md5": "faa71fbf70c0bee7ab93076fd007f4b0", 'info_dict': {
"info_dict": { 'id': '4d03aad9',
'ext': 'mp4',
'title': 'WALL-TO-GORTAT',
'upload_date': '20150126', 'upload_date': '20150126',
'uploader': 'deadspin', 'uploader': 'deadspin',
'id': '4d03aad9',
'timestamp': 1422285291, 'timestamp': 1422285291,
'title': 'WALL-TO-GORTAT',
} }
}, { }, {
"url": "http://www.viddler.com/player/221ebbbd/0/", 'url': 'http://www.viddler.com/player/221ebbbd/0/',
"file": "221ebbbd.mp4", 'md5': '0defa2bd0ea613d14a6e9bd1db6be326',
"md5": "0defa2bd0ea613d14a6e9bd1db6be326", 'info_dict': {
"info_dict": { 'id': '221ebbbd',
'ext': 'mp4',
'title': 'LETeens-Grammar-snack-third-conditional',
'description': ' ',
'upload_date': '20140929', 'upload_date': '20140929',
'uploader': 'BCLETeens', 'uploader': 'BCLETeens',
'id': '221ebbbd',
'timestamp': 1411997190, 'timestamp': 1411997190,
'title': 'LETeens-Grammar-snack-third-conditional',
'description': ' '
} }
}] }]
@ -68,7 +68,7 @@ class ViddlerIE(InfoExtractor):
if filed.get('status', 'ready') != 'ready': if filed.get('status', 'ready') != 'ready':
continue continue
f = { f = {
'format_id': filed['profile_id'], 'format_id': filed['profile_id'] or filed['profile_name'],
'format_note': filed['profile_name'], 'format_note': filed['profile_name'],
'url': self._proto_relative_url(filed['url']), 'url': self._proto_relative_url(filed['url']),
'width': int_or_none(filed.get('width')), 'width': int_or_none(filed.get('width')),
@ -82,15 +82,14 @@ class ViddlerIE(InfoExtractor):
if filed.get('cdn_url'): if filed.get('cdn_url'):
f = f.copy() f = f.copy()
f['url'] = self._proto_relative_url(filed['cdn_url'], 'http:') f['url'] = self._proto_relative_url(filed['cdn_url'], 'http:')
f['format_id'] = filed['profile_id'] + '-cdn' f['format_id'] = (filed['profile_id'] or filed['profile_name']) + '-cdn'
f['source_preference'] = 1 f['source_preference'] = 1
formats.append(f) formats.append(f)
if filed.get('html5_video_source'): if filed.get('html5_video_source'):
f = f.copy() f = f.copy()
f['url'] = self._proto_relative_url( f['url'] = self._proto_relative_url(filed['html5_video_source'])
filed['html5_video_source']) f['format_id'] = (filed['profile_id'] or filed['profile_name']) + '-html5'
f['format_id'] = filed['profile_id'] + '-html5'
f['source_preference'] = 0 f['source_preference'] = 0
formats.append(f) formats.append(f)
self._sort_formats(formats) self._sort_formats(formats)
@ -99,7 +98,6 @@ class ViddlerIE(InfoExtractor):
t.get('text') for t in data.get('tags', []) if 'text' in t] t.get('text') for t in data.get('tags', []) if 'text' in t]
return { return {
'_type': 'video',
'id': video_id, 'id': video_id,
'title': data['title'], 'title': data['title'],
'formats': formats, 'formats': formats,