From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 13:55:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'chrisjrn/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=fa59f4b6a9df03d1156dd2d274295a7b3d75c059;hp=-c;p=youtube-dl

Merge remote-tracking branch 'chrisjrn/master'
---

fa59f4b6a9df03d1156dd2d274295a7b3d75c059
diff --combined youtube_dl/InfoExtractors.py
index 1ac05523a,e9d8ad5b3..13b04ab5b
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@@ -2291,6 -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:
@@@ -2331,10 -2332,19 +2331,19 @@@
  			epTitle = mobj.group('episode')
  
  		mMovieParams = re.findall('(?:<param name="movie" value="|var url = ")(http://media.mtvnservices.com/([^"]*episode.*?:.*?))"', html)
+ 
  		if len(mMovieParams) == 0:
- 			self._downloader.trouble(u'ERROR: unable to find Flash URL in webpage ' + url)
- 			return
+ 			# The Colbert Report embeds the information in a without
+ 			# a URL prefix; so extract the alternate reference
+ 			# and then add the URL prefix manually.
  
+ 			altMovieParams = re.findall('data-mgid="([^"]*episode.*?:.*?)"', html)
+ 			if len(altMovieParams) == 0:
+ 				self._downloader.trouble(u'ERROR: unable to find Flash URL in webpage ' + url)
+ 				return
+ 			else:
+ 				mMovieParams = [("http://media.mtvnservices.com/" + altMovieParams[0], altMovieParams[0])]
+ 		
  		playerUrl_raw = mMovieParams[0][0]
  		self.report_player_url(epTitle)
  		try:
@@@ -2385,8 -2395,8 +2394,8 @@@
  				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]
@@@ -2396,17 -2406,20 +2405,17 @@@
  
  			# 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 = {