|
@ -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,16 @@ 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] |
|
|
|
|
|
print subext |
|
|
|
|
|
subtitles[sublang].append({'url': 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 +78,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, |
|
|
} |
|
|
} |