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

[dailymotion] use the normal HTTP 302 redirect

Browse Source
This commit is contained in:
remitamine 2015-09-08 19:37:13 +01:00
parent bc4a20a236
commit 20423b8cf6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/dailymotion.py
View File

@ -380,11 +380,6 @@ class DailymotionCloudIE(DailymotionBaseInfoExtractor):
if mobj:
return mobj.group(1)
def redirect(self, url, video_id):
if re.match(r'https?://.*cdn.*\.dmcloud\.net/route/', url):
return self._download_webpage(url + '&redirect=0', video_id).strip()
return url
def _real_extract(self, url):
video_id = self._match_id(url)
@ -397,12 +392,14 @@ class DailymotionCloudIE(DailymotionBaseInfoExtractor):
is_live = video_info['mode'] == 'live'
formats = self._extract_m3u8_formats(self.redirect(video_info['ios_url'], video_id), video_id)
ios_url = video_info['ios_url']
if '.m3u8' in ios_url:
formats = self._extract_m3u8_formats(ios_url, video_id)
if is_live:
title = self._live_title(title)
else:
formats.append({'url': self.redirect(video_info['mp4_url'], video_id), 'format_id': 'mp4'})
formats.append({'url': video_info['mp4_url'], 'format_id': 'mp4'})
return {
'id': video_id,