mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-22 08:47:41 +00:00
Merge remote-tracking branch 'chrisjrn/master'
This commit is contained in:
commit
fa59f4b6a9
1 changed files with 12 additions and 3 deletions
|
@ -2331,10 +2331,19 @@ class ComedyCentralIE(InfoExtractor):
|
||||||
epTitle = mobj.group('episode')
|
epTitle = mobj.group('episode')
|
||||||
|
|
||||||
mMovieParams = re.findall('(?:<param name="movie" value="|var url = ")(http://media.mtvnservices.com/([^"]*episode.*?:.*?))"', html)
|
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
|
|
||||||
|
|
||||||
|
if len(mMovieParams) == 0:
|
||||||
|
# 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]
|
playerUrl_raw = mMovieParams[0][0]
|
||||||
self.report_player_url(epTitle)
|
self.report_player_url(epTitle)
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in a new issue