projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MTV] move German mtv site to new class
[youtube-dl]
/
youtube_dl
/
extractor
/
funnyordie.py
diff --git
a/youtube_dl/extractor/funnyordie.py
b/youtube_dl/extractor/funnyordie.py
index 487d5d1b41b90f6afe3e3f739f80fc46262108be..f5f13689c0a8310d0e241f0cd24617d90799c701 100644
(file)
--- a/
youtube_dl/extractor/funnyordie.py
+++ b/
youtube_dl/extractor/funnyordie.py
@@
-21,7
+21,6
@@
class FunnyOrDieIE(InfoExtractor):
},
}, {
'url': 'http://www.funnyordie.com/embed/e402820827',
},
}, {
'url': 'http://www.funnyordie.com/embed/e402820827',
- 'md5': '29f4c5e5a61ca39dfd7e8348a75d0aad',
'info_dict': {
'id': 'e402820827',
'ext': 'mp4',
'info_dict': {
'id': 'e402820827',
'ext': 'mp4',
@@
-51,15
+50,21
@@
class FunnyOrDieIE(InfoExtractor):
bitrates.sort()
formats = []
bitrates.sort()
formats = []
-
for bitrate in bitrates:
for link in links:
formats.append({
for bitrate in bitrates:
for link in links:
formats.append({
- 'url':
'%s%d.%s' % (link[0], bitrate, link[1]
),
+ 'url':
self._proto_relative_url('%s%d.%s' % (link[0], bitrate, link[1])
),
'format_id': '%s-%d' % (link[1], bitrate),
'vbr': bitrate,
})
'format_id': '%s-%d' % (link[1], 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(
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
post = json.loads(post_json)
post_json = self._search_regex(
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
post = json.loads(post_json)
@@
-70,4
+75,5
@@
class FunnyOrDieIE(InfoExtractor):
'description': post.get('description'),
'thumbnail': post.get('picture'),
'formats': formats,
'description': post.get('description'),
'thumbnail': post.get('picture'),
'formats': formats,
+ 'subtitles': subtitles,
}
}