mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vimeo] Check source file URL (Closes #8187)

Browse Source
This commit is contained in:
Sergey M․
2016-01-09 03:06:09 +06:00
parent 14b4f038c0
commit d5f071afb5
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
youtube_dl/extractor/vimeo.py
View File

@@ -11,6 +11,7 @@ from ..compat import (
compat_urlparse, compat_urlparse,
) )
from ..utils import ( from ..utils import (
determine_ext,
encode_dict, encode_dict,
ExtractorError, ExtractorError,
InAdvancePagedList, InAdvancePagedList,
@@ -419,16 +420,21 @@ class VimeoIE(VimeoBaseInfoExtractor):
download_data = self._download_json(download_request, video_id, fatal=False) download_data = self._download_json(download_request, video_id, fatal=False)
if download_data: if download_data:
source_file = download_data.get('source_file') source_file = download_data.get('source_file')
if source_file and not source_file.get('is_cold') and not source_file.get('is_defrosting'): if isinstance(source_file, dict):
formats.append({ download_url = source_file.get('download_url')
'url': source_file['download_url'], if download_url and not source_file.get('is_cold') and not source_file.get('is_defrosting'):
'ext': source_file['extension'].lower(), source_name = source_file.get('public_name', 'Original')
'width': int_or_none(source_file.get('width')), if self._is_valid_url(download_url, video_id, '%s video' % source_name):
'height': int_or_none(source_file.get('height')), ext = source_file.get('extension', determine_ext(download_url)).lower(),
'filesize': parse_filesize(source_file.get('size')), formats.append({
'format_id': source_file.get('public_name', 'Original'), 'url': download_url,
'preference': 1, 'ext': ext,
}) 'width': int_or_none(source_file.get('width')),
'height': int_or_none(source_file.get('height')),
'filesize': parse_filesize(source_file.get('size')),
'format_id': source_name,
'preference': 1,
})
config_files = config['video'].get('files') or config['request'].get('files', {}) config_files = config['video'].get('files') or config['request'].get('files', {})
for f in config_files.get('progressive', []): for f in config_files.get('progressive', []):
video_url = f.get('url') video_url = f.get('url')