projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git pushMerge branch 'master' of github.com:rg3/youtube-dl
[youtube-dl]
/
youtube_dl
/
extractor
/
funnyordie.py
diff --git
a/youtube_dl/extractor/funnyordie.py
b/youtube_dl/extractor/funnyordie.py
index 0a22d99d2dbe7d510c37439dac2779d60a883b45..8c5ffc9e84cec305e9fc813a6366b360b7e36230 100644
(file)
--- a/
youtube_dl/extractor/funnyordie.py
+++ b/
youtube_dl/extractor/funnyordie.py
@@
-45,27
+45,32
@@
class FunnyOrDieIE(InfoExtractor):
links.sort(key=lambda link: 1 if link[1] == 'mp4' else 0)
links.sort(key=lambda link: 1 if link[1] == 'mp4' else 0)
- bitrates = self._html_search_regex(r'<source src="[^"]+/v,((?:\d+,)+)\.mp4\.csmil', webpage, 'video bitrates')
- bitrates = [int(b) for b in bitrates.rstrip(',').split(',')]
-
bitrates.sort(
)
+ m3u8_url = self._search_regex(
+ r'<source[^>]+src=(["\'])(?P<url>.+?/master\.m3u8[^"\']*)\1',
+
webpage, 'm3u8 url', group='url'
)
formats = []
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.sort()
+
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={}
- subtitle_matches=re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage)
- for match in subtitle_matches:
- (suburl,sublang)=match
- if not sublang in subtitles.keys():
- subtitles[sublang]=[]
- subext=suburl.split('/')[-1]
- subtitles[sublang].append({'url': 'http://www.funnyordie.com'+suburl,'ext': subext})
+ 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 = self._search_regex(
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')