R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[vimeo] Fix normal videos (Fixes #1642)

Browse Source 
Vimeo Pro Videos are still broken
This commit is contained in:
Philipp Hagemeister 2013-10-23 11:38:51 +02:00
parent df1c39ec5c
commit 71907db3ba
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/vimeo.py
View File

@ -25,7 +25,7 @@ class VimeoIE(InfoExtractor):
{ {
u'url': u'http://vimeo.com/56015672', u'url': u'http://vimeo.com/56015672',
u'file': u'56015672.mp4', u'file': u'56015672.mp4',
u'md5': u'8879b6cc097e987f02484baf890129e5', u'md5': u'ae7a1d8b183758a0506b0622f37dfa14',
u'info_dict': { u'info_dict': {
u"upload_date": u"20121220", u"upload_date": u"20121220",
u"description": u"This is a test case for youtube-dl.\nFor more information, see github.com/rg3/youtube-dl\nTest chars: \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550", u"description": u"This is a test case for youtube-dl.\nFor more information, see github.com/rg3/youtube-dl\nTest chars: \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550",
@ -129,10 +129,11 @@ class VimeoIE(InfoExtractor):
# Extract the config JSON # Extract the config JSON
try: try:
config = self._search_regex([r' = {config:({.+?}),assets:', r'c=({.+?);'], config_url = self._html_search_regex(
webpage, u'info section', flags=re.DOTALL) r' data-config-url="(.+?)"', webpage, u'config URL')
config = json.loads(config) config_json = self._download_webpage(config_url, video_id)
except: config = json.loads(config_json)
except Exception as e:
if re.search('The creator of this video has not given you permission to embed it on this domain.', webpage): if re.search('The creator of this video has not given you permission to embed it on this domain.', webpage):
raise ExtractorError(u'The author has restricted the access to this video, try with the "--referer" option') raise ExtractorError(u'The author has restricted the access to this video, try with the "--referer" option')
@ -140,7 +141,8 @@ class VimeoIE(InfoExtractor):
self._verify_video_password(url, video_id, webpage) self._verify_video_password(url, video_id, webpage)
return self._real_extract(url) return self._real_extract(url)
else: else:
raise ExtractorError(u'Unable to extract info section') raise ExtractorError(u'Unable to extract info section',
cause=e)
# Extract title # Extract title
video_title = config["video"]["title"] video_title = config["video"]["title"]