paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pishposhmcgee/youtube-dl into pishposhmcgee-master

Browse Source
This commit is contained in:
Sergey M․ 2015-03-11 21:45:43 +06:00
commit c6052b8c14
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/funnyordie.py
View File

@ -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,15 @@ class FunnyOrDieIE(InfoExtractor):
'vbr': 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})
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 +77,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,
} }