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:
46c8c43
)
Temporarily fix dailyshow+colbertnation media IDs
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 7 Sep 2011 21:15:26 +0000
(23:15 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 7 Sep 2011 21:15:26 +0000
(23:15 +0200)
youtube-dl
patch
|
blob
|
history
diff --git
a/youtube-dl
b/youtube-dl
index
f3472f2
..
651e9d3
100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-3074,13
+3074,22
@@
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
if len(mMovieParams) == 0:
self._downloader.trouble(u'ERROR: unable to find Flash URL in webpage ' + url)
return
- ACT_COUNT = 4
+ show_id = mMovieParams[0][2]
+ ACT_COUNT = { # TODO: Detect this dynamically
+ 'thedailyshow.com': 4,
+ 'colbertnation.com': 3,
+ }.get(show_id, 4)
+ OFFSET = {
+ 'thedailyshow.com': -ACT_COUNT,
+ 'colbertnation.com': 1,
+ }.get(show_id, -ACT_COUNT)
+
first_player_url = mMovieParams[0][0]
first_player_url = mMovieParams[0][0]
- mediaNum = int(mMovieParams[0][
2]) - ACT_COUN
T
+ mediaNum = int(mMovieParams[0][
3]) + OFFSE
T
movieId = mMovieParams[0][1]
playerReq = urllib2.Request(first_player_url)
movieId = mMovieParams[0][1]
playerReq = urllib2.Request(first_player_url)
@@
-3093,6
+3102,7
@@
class ComedyCentralIE(InfoExtractor):
player_url = playerResponse.geturl()
for actNum in range(ACT_COUNT):
player_url = playerResponse.geturl()
for actNum in range(ACT_COUNT):
+ actTitle = 'act' + str(actNum+1)
mediaId = movieId + str(mediaNum + actNum)
configUrl = ('http://www.comedycentral.com/global/feeds/entertainment/media/mediaGenEntertainment.jhtml?' +
urllib.urlencode({'uri': mediaId}))
mediaId = movieId + str(mediaNum + actNum)
configUrl = ('http://www.comedycentral.com/global/feeds/entertainment/media/mediaGenEntertainment.jhtml?' +
urllib.urlencode({'uri': mediaId}))
@@
-3110,18
+3120,23
@@
class ComedyCentralIE(InfoExtractor):
finfo = (rendition.attrib['bitrate'], rendition.findall('./src')[0].text)
turls.append(finfo)
finfo = (rendition.attrib['bitrate'], rendition.findall('./src')[0].text)
turls.append(finfo)
+ if len(turls) == 0:
+ self._downloader.trouble(u'\nERROR: unable to download ' + actTitle + ': No videos found')
+ continue
+
# For now, just pick the highest bitrate
format,video_url = turls[-1]
self._downloader.increment_downloads()
# For now, just pick the highest bitrate
format,video_url = turls[-1]
self._downloader.increment_downloads()
- actTitle = 'act' + str(actNum+1)
+
+ effTitle = show_id.replace('.com', '') + '-' + epTitle
info = {
'id': actTitle,
'url': video_url,
info = {
'id': actTitle,
'url': video_url,
- 'uploader':
'NA'
,
+ 'uploader':
show_id
,
'upload_date': 'NA',
'upload_date': 'NA',
- 'title': e
p
Title,
- 'stitle': self._simplify_title(e
p
Title),
+ 'title': e
ff
Title,
+ 'stitle': self._simplify_title(e
ff
Title),
'ext': 'mp4',
'format': format,
'thumbnail': None,
'ext': 'mp4',
'format': format,
'thumbnail': None,
@@
-3132,7
+3147,8
@@
class ComedyCentralIE(InfoExtractor):
try:
self._downloader.process_info(info)
except UnavailableVideoError, err:
try:
self._downloader.process_info(info)
except UnavailableVideoError, err:
- self._downloader.trouble(u'\nERROR: unable to download video')
+ self._downloader.trouble(u'\nERROR: unable to download ' + actTitle)
+ continue
class PostProcessor(object):
class PostProcessor(object):