git://git.jankratochvil.net
/
youtube-dl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8e3004
)
comedycentral: include player URL (still broken)
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 7 Sep 2011 19:43:19 +0000
(21:43 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 7 Sep 2011 19:43:19 +0000
(21:43 +0200)
youtube-dl
patch
|
blob
|
history
diff --git
a/youtube-dl
b/youtube-dl
index
2360343
..
71e7aa8
100755
(executable)
--- 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
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
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):
for actNum in range(ACT_COUNT):
- mediaId = m
MovieParams[0][0]
+ str(mediaNum + actNum)
+ mediaId = m
ovieId
+ str(mediaNum + actNum)
configUrl = ('http://www.comedycentral.com/global/feeds/entertainment/media/mediaGenEntertainment.jhtml?' +
urllib.urlencode({'uri': mediaId}))
configReq = urllib2.Request(configUrl)
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',
'format': format,
'thumbnail': None,
'description': 'TODO: Not yet supported',
- 'player_url':
None
+ 'player_url':
player_url
}
try:
}
try: