diff options
| author | PishPosh.McGee <pishposhmcgee@users.noreply.github.com> | 2015-03-10 15:22:46 -0500 | 
|---|---|---|
| committer | PishPosh.McGee <pishposhmcgee@users.noreply.github.com> | 2015-03-10 15:22:46 -0500 | 
| commit | 614a7e1e230e095d9a11b59b20f4ff7462be8b21 (patch) | |
| tree | 2c7eefffe92b8f465c681c8d7fc285a480bf4f19 | |
| parent | 2ebfeacabc7b74d03fa7cb096d8b9d1ecbdbb6e4 (diff) | |
Added subtitles for FunnyOrDie
| -rw-r--r-- | youtube_dl/extractor/funnyordie.py | 12 | 
1 files changed, 11 insertions, 1 deletions
diff --git a/youtube_dl/extractor/funnyordie.py b/youtube_dl/extractor/funnyordie.py index a49fc1151..f832ac5c3 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,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,          }  | 
