aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2011-09-07 21:43:19 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2011-09-07 21:43:19 +0200
commit0f862ea18cdfdc4489c0b1915d52bd2296c1ebc3 (patch)
treec8dec74fc7d21136928217ac1e024d5bd3bb7bbd
parentc8e30044b8180d88ff49a2d1540fd34a81dacfee (diff)
comedycentral: include player URL (still broken)
-rwxr-xr-xyoutube-dl10
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube-dl b/youtube-dl
index 23603438d..71e7aa8d8 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -3071,15 +3071,17 @@ class ComedyCentralIE(InfoExtractor):
self._downloader.trouble(u'ERROR: unable to download webpage: %s' % unicode(err))
return
- mMovieParams = re.findall('<param name="movie" value="http://media.mtvnservices.com/(.*?:episode:.*?:)(.*?)"/>', html)
+ mMovieParams = re.findall('<param name="movie" value="(http://media.mtvnservices.com/(.*?:episode:.*?:)(.*?))"/>', html)
if len(mMovieParams) == 0:
self._downloader.trouble(u'ERROR: unable to find Flash URL in webpage ' + url)
return
ACT_COUNT = 4
- mediaNum = int(mMovieParams[0][1]) - ACT_COUNT
+ player_url = mMovieParams[0][0]
+ mediaNum = int(mMovieParams[0][2]) - ACT_COUNT
+ movieId = mMovieParams[0][1]
for actNum in range(ACT_COUNT):
- mediaId = mMovieParams[0][0] + str(mediaNum + actNum)
+ mediaId = movieId + str(mediaNum + actNum)
configUrl = ('http://www.comedycentral.com/global/feeds/entertainment/media/mediaGenEntertainment.jhtml?' +
urllib.urlencode({'uri': mediaId}))
configReq = urllib2.Request(configUrl)
@@ -3112,7 +3114,7 @@ class ComedyCentralIE(InfoExtractor):
'format': format,
'thumbnail': None,
'description': 'TODO: Not yet supported',
- 'player_url': None
+ 'player_url': player_url
}
try: