midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[vimeo] Improve regex for the config js dict (fixes #3955, fixes #3974)

Browse source 
The javascript code contains assignments of empty dicts with the same variable name
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-10-17 15:49:16 +02:00
parent 355d074ff9
commit 4698f0d858
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/vimeo.py
View file

@ -157,6 +157,18 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor):
'duration': 62, 'duration': 62,
} }
}, },
{
# from https://www.ouya.tv/game/Pier-Solar-and-the-Great-Architects/
'url': 'https://player.vimeo.com/video/98044508',
'note': 'The js code contains assignments to the same variable as the config',
'info_dict': {
'id': '98044508',
'ext': 'mp4',
'title': 'Pier Solar OUYA Official Trailer',
'uploader': 'Tulio Gonçalves',
'uploader_id': 'user28849593',
},
},
] ]
def _verify_video_password(self, url, video_id, webpage): def _verify_video_password(self, url, video_id, webpage):
@ -244,7 +256,7 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor):
# We try to find out to which variable is assigned the config dic # We try to find out to which variable is assigned the config dic
m_variable_name = re.search('(\w)\.video\.id', webpage) m_variable_name = re.search('(\w)\.video\.id', webpage)
if m_variable_name is not None: if m_variable_name is not None:
config_re = r'%s=({.+?});' % re.escape(m_variable_name.group(1)) config_re = r'%s=({[^}].+?});' % re.escape(m_variable_name.group(1))
else: else:
config_re = [r' = {config:({.+?}),assets:', r'(?:[abc])=({.+?});'] config_re = [r' = {config:({.+?}),assets:', r'(?:[abc])=({.+?});']
config = self._search_regex(config_re, webpage, 'info section', config = self._search_regex(config_re, webpage, 'info section',