Added subtitles for FunnyOrDie

pull/5174/head
PishPosh.McGee 2015-03-10 15:22:46 -05:00
parent 2ebfeacabc
commit 614a7e1e23
1 changed files with 11 additions and 1 deletions

View File

@ -50,7 +50,6 @@ class FunnyOrDieIE(InfoExtractor):
bitrates.sort()
formats = []
for bitrate in bitrates:
for link in links:
formats.append({
@ -59,6 +58,16 @@ class FunnyOrDieIE(InfoExtractor):
'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]
print subext
subtitles[sublang].append({'url': suburl,'ext': subext})
post_json = self._search_regex(
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
post = json.loads(post_json)
@ -69,4 +78,5 @@ class FunnyOrDieIE(InfoExtractor):
'description': post.get('description'),
'thumbnail': post.get('picture'),
'formats': formats,
'subtitles': subtitles,
}