diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-11-27 13:24:10 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-11-27 13:24:10 +0100 |
| commit | 6bac102a4dc49a1e92eb4e37eff61d1216915c44 (patch) | |
| tree | 24e8aafd6a86419f9377408e4e464b49fb95b20d /youtube_dl | |
| parent | 958a22b7cf3e20ac4f05ff6817bdac34a14ab327 (diff) | |
| download | youtube-dl-6bac102a4dc49a1e92eb4e37eff61d1216915c44.tar.xz | |
Fix spacing in comedycentral IE
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 64383fea4..1ac05523a 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -2291,7 +2291,6 @@ class ComedyCentralIE(InfoExtractor): print('%s\t:\t%s\t[%s]' %(x, self._video_extensions.get(x, 'mp4'), self._video_dimensions.get(x, '???'))) - def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) if mobj is None: @@ -2386,8 +2385,8 @@ class ComedyCentralIE(InfoExtractor): continue if self._downloader.params.get('listformats', None): - self._print_formats([i[0] for i in turls]) - return + self._print_formats([i[0] for i in turls]) + return # For now, just pick the highest bitrate format,video_url = turls[-1] @@ -2397,20 +2396,17 @@ class ComedyCentralIE(InfoExtractor): # Select format if we can find one for f,v in turls: - if f == req_format: - format, video_url = f, v - break - - # Patch to download from alternative CDN, which does not - # break on current RTMPDump builds - + if f == req_format: + format, video_url = f, v + break + # Patch to download from alternative CDN, which does not + # break on current RTMPDump builds broken_cdn = "rtmpe://viacomccstrmfs.fplive.net/viacomccstrm/gsp.comedystor/" better_cdn = "rtmpe://cp10740.edgefcs.net/ondemand/mtvnorigin/gsp.comedystor/" - + if video_url.startswith(broken_cdn): - video_url = video_url.replace(broken_cdn, better_cdn) - + video_url = video_url.replace(broken_cdn, better_cdn) effTitle = showId + u'-' + epTitle info = { |