aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-03-11 21:45:43 +0600
committerSergey M․ <dstftw@gmail.com>2015-03-11 21:45:43 +0600
commitc6052b8c14db35258b5bb8fcb66b7216615083f5 (patch)
tree31de973c26b28f635e15f084c60502883ae49a09 /youtube_dl/extractor
parentc792b5011fe56af654d99378c1e77837475d7b69 (diff)
parent1593194c63acd8dc8aa125edbde443680fabd2f7 (diff)
Merge branch 'master' of https://github.com/pishposhmcgee/youtube-dl into pishposhmcgee-master
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/funnyordie.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py
index a49fc1151..0a22d99d2 100644
--- a/youtube_dl/extractor/funnyordie.py
+++ b/youtube_dl/extractor/funnyordie.py
@@ -50,7 +50,6 @@ class FunnyOrDieIE(InfoExtractor):
bitrates.sort()
formats = []
-
for bitrate in bitrates:
for link in links:
formats.append({
@@ -59,6 +58,15 @@ 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]
+ subtitles[sublang].append({'url': 'http://www.funnyordie.com'+suburl,'ext': subext})
+
post_json = self._search_regex(
r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')
post = json.loads(post_json)
@@ -69,4 +77,5 @@ class FunnyOrDieIE(InfoExtractor):
'description': post.get('description'),
'thumbnail': post.get('picture'),
'formats': formats,
+ 'subtitles': subtitles,
}