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

[funnyordie] Improve bitrate regex, add _check_formats call for video

Browse Source 
URLs (some .webm urls, not all, return 403 error)
This commit is contained in:
Andy Savicki 2016-11-16 02:37:28 +03:00
parent 58355a3bf1
commit b77c70119b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/funnyordie.py
View File

@ -51,10 +51,7 @@ class FunnyOrDieIE(InfoExtractor):
formats = []
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 = [int(bitrate) for bitrate in re.findall(r'v(\d+)[,/]', m3u8_url)]
bitrates.sort()
for bitrate in bitrates:
@ -65,6 +62,11 @@ class FunnyOrDieIE(InfoExtractor):
'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 = {}
for src, src_lang in re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage):
subtitles[src_lang] = [{
@ -78,7 +80,7 @@ class FunnyOrDieIE(InfoExtractor):
return {
'id': video_id,
'title': post['name'],
'title': post.get('name'),
'description': post.get('description'),
'thumbnail': post.get('picture'),
'formats': formats,