]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[funnyordie] Simplify subtitles
authorSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:56:22 +0000 (21:56 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:56:22 +0000 (21:56 +0600)
youtube_dl/extractor/funnyordie.py

index 0a22d99d2dbe7d510c37439dac2779d60a883b45..dd87257c465983dcda30a6faf5dbd7bc0950560c 100644 (file)
@@ -58,14 +58,12 @@ 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})
+        subtitles = {}
+        for src, src_lang in re.findall(r'<track kind="captions" src="([^"]+)" srclang="([^"]+)"', webpage):
+            subtitles[src_lang] = [{
+                'ext': src.split('/')[-1],
+                'url': 'http://www.funnyordie.com%s' % src,
+            }]
 
         post_json = self._search_regex(
             r'fb_post\s*=\s*(\{.*?\});', webpage, 'post details')