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:
fedf9f3
)
Switch around act and episode title (makes -t nicer)
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 7 Sep 2011 20:42:33 +0000
(22:42 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 7 Sep 2011 20:42:33 +0000
(22:42 +0200)
youtube-dl
patch
|
blob
|
history
diff --git
a/youtube-dl
b/youtube-dl
index
a1245a8
..
f3472f2
100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-3103,7
+3103,7
@@
class ComedyCentralIE(InfoExtractor):
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
self._downloader.trouble(u'ERROR: unable to download webpage: %s' % unicode(err))
return
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
self._downloader.trouble(u'ERROR: unable to download webpage: %s' % unicode(err))
return
-
+
cdoc = xml.etree.ElementTree.fromstring(configXml)
turls = []
for rendition in cdoc.findall('.//rendition'):
cdoc = xml.etree.ElementTree.fromstring(configXml)
turls = []
for rendition in cdoc.findall('.//rendition'):
@@
-3116,19
+3116,19
@@
class ComedyCentralIE(InfoExtractor):
self._downloader.increment_downloads()
actTitle = 'act' + str(actNum+1)
info = {
self._downloader.increment_downloads()
actTitle = 'act' + str(actNum+1)
info = {
- 'id':
ep
Title,
+ 'id':
act
Title,
'url': video_url,
'uploader': 'NA',
'upload_date': 'NA',
'url': video_url,
'uploader': 'NA',
'upload_date': 'NA',
- 'title':
act
Title,
- 'stitle': self._simplify_title(
act
Title),
+ 'title':
ep
Title,
+ 'stitle': self._simplify_title(
ep
Title),
'ext': 'mp4',
'format': format,
'thumbnail': None,
'description': 'TODO: Not yet supported',
'player_url': player_url
}
'ext': 'mp4',
'format': format,
'thumbnail': None,
'description': 'TODO: Not yet supported',
'player_url': player_url
}
-
+
try:
self._downloader.process_info(info)
except UnavailableVideoError, err:
try:
self._downloader.process_info(info)
except UnavailableVideoError, err: