Merge branch 'master' of https://github.com/pishposhmcgee/youtube-dl into pishposhmcg...
authorSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:45:43 +0000 (21:45 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:45:43 +0000 (21:45 +0600)
youtube_dl/extractor/funnyordie.py

index a49fc1151cf324f5e4b61cbd4f1d586718410626..0a22d99d2dbe7d510c37439dac2779d60a883b45 100644 (file)
@@ -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,
         }