Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-07 15:27:15 +08:00
Code Issues Releases Wiki Activity

Merged remote branch 'upstream/master'

Browse Source
This commit is contained in:
Nevar 2010-11-05 11:00:28 +02:00
commit 38b90958e8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
youtube-dl Executable file → Normal file
View File

@ -1967,11 +1967,10 @@ class YoutubePlaylistIE(InfoExtractor):
break break
pagenum = pagenum + 1 pagenum = pagenum + 1
playliststart = self._downloader.params.get('playliststart', 1) playliststart = self._downloader.params.get('playliststart', 1) - 1
playliststart -= 1 #our arrays are zero-based but the playlist is 1-based playlistend = self._downloader.params.get('playlistend', -1)
playlistend = self._downloader.params.get('playlistend', -1) #last item of video_ids is not used video_ids = video_ids[playliststart:playlistend]
video_ids = video_ids[playliststart:playlistend] #always use slice as options have default values
for id in video_ids: for id in video_ids:
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id) self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
return return
@ -2027,10 +2026,9 @@ class YoutubeUserIE(InfoExtractor):
ids_in_page.append(mobj.group(1)) ids_in_page.append(mobj.group(1))
video_ids.extend(ids_in_page) video_ids.extend(ids_in_page)
playliststart = self._downloader.params.get('playliststart', 1) playliststart = self._downloader.params.get('playliststart', 1) - 1
playliststart -= 1 #our arrays are zero-based but the playlist is 1-based playlistend = self._downloader.params.get('playlistend', -1)
playlistend = self._downloader.params.get('playlistend', -1) #last item of video_ids is not used video_ids = video_ids[playliststart:playlistend]
video_ids = video_ids[playliststart:playlistend] #always use slice as options have default values
for id in video_ids: for id in video_ids:
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id) self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
@ -2242,16 +2240,18 @@ if __name__ == '__main__':
opts.retries = long(opts.retries) opts.retries = long(opts.retries)
except (TypeError, ValueError), err: except (TypeError, ValueError), err:
parser.error(u'invalid retry count specified') parser.error(u'invalid retry count specified')
if opts.playliststart is not None: try:
try: opts.playliststart = long(opts.playliststart)
opts.playliststart = long(opts.playliststart) if opts.playliststart <= 0:
except (TypeError, ValueError), err: raise ValueError
parser.error(u'invalid playlist-start page specified') except (TypeError, ValueError), err:
if opts.playlistend is not None: parser.error(u'invalid playlist start number specified')
try: try:
opts.playlistend = long(opts.playlistend) opts.playlistend = long(opts.playlistend)
except (TypeError, ValueError), err: if opts.playlistend != -1 and (opts.playlistend <= 0 or opts.playlistend < opts.playliststart):
parser.error(u'invalid playlist-end page specified') raise ValueError
except (TypeError, ValueError), err:
parser.error(u'invalid playlist end number specified')
# Information extractors # Information extractors
youtube_ie = YoutubeIE() youtube_ie = YoutubeIE()