瀏覽代碼

DailymotionIE: some videos do not use the "hqURL", "sdURL", "ldURL" keywords. In this case, the "video_url" keyword should be looked for.

Cyril Roelandt 13 年之前
父節點
當前提交
7b6d7001d8
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      youtube_dl/InfoExtractors.py

+ 3 - 1
youtube_dl/InfoExtractors.py

@@ -662,10 +662,12 @@ class DailymotionIE(InfoExtractor):
 		elif 'sdURL' in flashvars: max_quality = 'sdURL'
 		elif 'sdURL' in flashvars: max_quality = 'sdURL'
 		else: max_quality = 'ldURL'
 		else: max_quality = 'ldURL'
 		mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars)
 		mobj = re.search(r'"' + max_quality + r'":"(.+?)"', flashvars)
+		if mobj is None:
+			mobj = re.search(r'"video_url":"(.*?)",', urllib.unquote(webpage))
 		if mobj is None:
 		if mobj is None:
 			self._downloader.trouble(u'ERROR: unable to extract media URL')
 			self._downloader.trouble(u'ERROR: unable to extract media URL')
 			return
 			return
-		video_url = mobj.group(1).replace('\\/', '/')
+		video_url = urllib.unquote(mobj.group(1)).replace('\\/', '/')
 
 
 		# TODO: support choosing qualities
 		# TODO: support choosing qualities