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

[vimeo] Extract license (closes #11880)

This commit is contained in:
Sergey M․ 2017-02-01 00:49:28 +07:00
parent 363245ad94
commit c38a67bcd5
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/vimeo.py
View File

@ -218,6 +218,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
'uploader_id': 'user7108434', 'uploader_id': 'user7108434',
'uploader': 'Filippo Valsorda', 'uploader': 'Filippo Valsorda',
'duration': 10, 'duration': 10,
'license': 'by-sa',
}, },
}, },
{ {
@ -486,6 +487,8 @@ class VimeoIE(VimeoBaseInfoExtractor):
'%s said: %s' % (self.IE_NAME, seed_status['title']), '%s said: %s' % (self.IE_NAME, seed_status['title']),
expected=True) expected=True)
cc_license = None
# Extract the config JSON # Extract the config JSON
try: try:
try: try:
@ -499,8 +502,9 @@ class VimeoIE(VimeoBaseInfoExtractor):
vimeo_clip_page_config = self._search_regex( vimeo_clip_page_config = self._search_regex(
r'vimeo\.clip_page_config\s*=\s*({.+?});', webpage, r'vimeo\.clip_page_config\s*=\s*({.+?});', webpage,
'vimeo clip page config') 'vimeo clip page config')
config_url = self._parse_json( page_config = self._parse_json(vimeo_clip_page_config, video_id)
vimeo_clip_page_config, video_id)['player']['config_url'] config_url = page_config['player']['config_url']
cc_license = page_config.get('cc_license')
config_json = self._download_webpage(config_url, video_id) config_json = self._download_webpage(config_url, video_id)
config = json.loads(config_json) config = json.loads(config_json)
except RegexNotFoundError: except RegexNotFoundError:
@ -609,6 +613,12 @@ class VimeoIE(VimeoBaseInfoExtractor):
info_dict = self._parse_config(config, video_id) info_dict = self._parse_config(config, video_id)
formats.extend(info_dict['formats']) formats.extend(info_dict['formats'])
self._vimeo_sort_formats(formats) self._vimeo_sort_formats(formats)
if not cc_license:
cc_license = self._search_regex(
r'<link[^>]+rel=["\']license["\'][^>]+href=(["\'])(?P<license>(?:(?!\1).)+)\1',
webpage, 'license', default=None, group='license')
info_dict.update({ info_dict.update({
'id': video_id, 'id': video_id,
'formats': formats, 'formats': formats,
@ -618,6 +628,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
'view_count': view_count, 'view_count': view_count,
'like_count': like_count, 'like_count': like_count,
'comment_count': comment_count, 'comment_count': comment_count,
'license': cc_license,
}) })
return info_dict return info_dict