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

[ruleporn] Undo related changes (funnyordie) for PR #11207

Browse Source
This commit is contained in:
Andy Savicki 2016-11-19 20:06:10 +03:00
parent b3af4c2787
commit a80949fbfd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/funnyordie.py
View File

@ -51,7 +51,10 @@ class FunnyOrDieIE(InfoExtractor):
formats = [] formats = []
bitrates = [int(bitrate) for bitrate in re.findall(r'v(\d+)[,/]', m3u8_url)] formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
bitrates = [int(bitrate) for bitrate in re.findall(r'[,/]v(\d+)[,/]', m3u8_url)]
bitrates.sort() bitrates.sort()
for bitrate in bitrates: for bitrate in bitrates:
@ -62,11 +65,6 @@ class FunnyOrDieIE(InfoExtractor):
'vbr': bitrate, 'vbr': bitrate,
}) })
self._check_formats(formats, video_id)
formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
subtitles = {} subtitles = {}
for src, src_lang in re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage): for src, src_lang in re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage):
subtitles[src_lang] = [{ subtitles[src_lang] = [{
@ -80,9 +78,9 @@ class FunnyOrDieIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': post.get('name'), 'title': post['name'],
'description': post.get('description'), 'description': post.get('description'),
'thumbnail': post.get('picture'), 'thumbnail': post.get('picture'),
'formats': formats, 'formats': formats,
'subtitles': subtitles, 'subtitles': subtitles,
} }