diff options
author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-12-10 20:28:12 +0100 |
---|---|---|
committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-12-10 20:28:12 +0100 |
commit | 48ad51b243b1fbca7f1e72e209f38f5ca90335ad (patch) | |
tree | 2f07671232a43b8c0e04d75980899042203140ed | |
parent | 5458b4cefbfff4b419f22ad33fbaffda25b83382 (diff) | |
download | youtube-dl-48ad51b243b1fbca7f1e72e209f38f5ca90335ad.zip youtube-dl-48ad51b243b1fbca7f1e72e209f38f5ca90335ad.tar.gz youtube-dl-48ad51b243b1fbca7f1e72e209f38f5ca90335ad.tar.bz2 |
[vimeo] Fix the extraction for some 'player' or 'pro' videos
The variable the config dict is assigned to can change, now we try to detect it or fallback to a, b or c
-rw-r--r-- | youtube_dl/extractor/vimeo.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index fb2bd22..7c7f537 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -151,8 +151,14 @@ class VimeoIE(InfoExtractor): config = json.loads(config_json) except RegexNotFoundError: # For pro videos or player.vimeo.com urls - config = self._search_regex([r' = {config:({.+?}),assets:', r'(?:c|b)=({.+?});'], - webpage, u'info section', flags=re.DOTALL) + # We try to find out to which variable is assigned the config dic + m_variable_name = re.search('(\w)\.video\.id', webpage) + if m_variable_name is not None: + config_re = r'%s=({.+?});' % re.escape(m_variable_name.group(1)) + else: + config_re = [r' = {config:({.+?}),assets:', r'(?:[abc])=({.+?});'] + config = self._search_regex(config_re, webpage, u'info section', + flags=re.DOTALL) config = json.loads(config) except Exception as e: if re.search('The creator of this video has not given you permission to embed it on this domain.', webpage): |