mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-09-06 05:45:14 +02:00
Merge branch 'pishposhmcgee-master'
This commit is contained in:
commit
e04793401d
@ -50,7 +50,6 @@ class FunnyOrDieIE(InfoExtractor):
|
|||||||
bitrates.sort()
|
bitrates.sort()
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
|
|
||||||
for bitrate in bitrates:
|
for bitrate in bitrates:
|
||||||
for link in links:
|
for link in links:
|
||||||
formats.append({
|
formats.append({
|
||||||
@ -59,6 +58,13 @@ class FunnyOrDieIE(InfoExtractor):
|
|||||||
'vbr': bitrate,
|
'vbr': bitrate,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
subtitles = {}
|
||||||
|
for src, src_lang in re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage):
|
||||||
|
subtitles[src_lang] = [{
|
||||||
|
'ext': src.split('/')[-1],
|
||||||
|
'url': 'http://www.funnyordie.com%s' % src,
|
||||||
|
}]
|
||||||
|
|
||||||
post_json = self._search_regex(
|
post_json = self._search_regex(
|
||||||
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
|
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
|
||||||
post = json.loads(post_json)
|
post = json.loads(post_json)
|
||||||
@ -69,4 +75,5 @@ class FunnyOrDieIE(InfoExtractor):
|
|||||||
'description': post.get('description'),
|
'description': post.get('description'),
|
||||||
'thumbnail': post.get('picture'),
|
'thumbnail': post.get('picture'),
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
|
'subtitles': subtitles,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user