v/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2020-11-18 19:53:54 -08:00
Code Issues Releases Wiki Activity

Added playlist-end option

Browse Source 
Added code and commentary for the playlist-end option.
Removed check > 0 on playlist-start in favor of using slice on video-ids.
This commit is contained in:
Nevar Angelo 2010-11-04 22:52:59 +02:00
parent 893a13df55
commit ba3e63da49
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube-dl
View File

@ -204,6 +204,7 @@ class FileDownloader(object):
continuedl: Try to continue downloads if possible. continuedl: Try to continue downloads if possible.
noprogress: Do not print the progress bar. noprogress: Do not print the progress bar.
playliststart: Playlist item to start at. playliststart: Playlist item to start at.
playlistend: Playlist item to end at.
logtostderr: Log messages to stderr instead of stdout. logtostderr: Log messages to stderr instead of stdout.
""" """
@ -1968,8 +1969,8 @@ class YoutubePlaylistIE(InfoExtractor):
playliststart = self._downloader.params.get('playliststart', 1) playliststart = self._downloader.params.get('playliststart', 1)
playliststart -= 1 #our arrays are zero-based but the playlist is 1-based playliststart -= 1 #our arrays are zero-based but the playlist is 1-based
if playliststart > 0: playlistend = self._downloader.params.get('playlistend', -1) #last item of video_ids is not used
video_ids = video_ids[playliststart:] 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)
@ -2027,9 +2028,9 @@ class YoutubeUserIE(InfoExtractor):
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)
playliststart = playliststart-1 #our arrays are zero-based but the playlist is 1-based playliststart -= 1 #our arrays are zero-based but the playlist is 1-based
if playliststart > 0: playlistend = self._downloader.params.get('playlistend', -1) #last item of video_ids is not used
video_ids = video_ids[playliststart:] 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)
@ -2125,6 +2126,8 @@ if __name__ == '__main__':
dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10) dest='retries', metavar='RETRIES', help='number of retries (default is 10)', default=10)
parser.add_option('--playlist-start', parser.add_option('--playlist-start',
dest='playliststart', metavar='NUMBER', help='playlist video to start at (default is 1)', default=1) dest='playliststart', metavar='NUMBER', help='playlist video to start at (default is 1)', default=1)
parser.add_option('--playlist-end',
dest='playlistend', metavar='NUMBER', help='playlist video to end at (default is last)', default=-1)
authentication = optparse.OptionGroup(parser, 'Authentication Options') authentication = optparse.OptionGroup(parser, 'Authentication Options')
authentication.add_option('-u', '--username', authentication.add_option('-u', '--username',
@ -2243,7 +2246,12 @@ if __name__ == '__main__':
try: try:
opts.playliststart = long(opts.playliststart) opts.playliststart = long(opts.playliststart)
except (TypeError, ValueError), err: except (TypeError, ValueError), err:
parser.error(u'invalid playlist page specified') parser.error(u'invalid playlist-start page specified')
if opts.playlistend is not None:
try:
opts.playlistend = long(opts.playlistend)
except (TypeError, ValueError), err:
parser.error(u'invalid playlist-end page specified')
# Information extractors # Information extractors
youtube_ie = YoutubeIE() youtube_ie = YoutubeIE()
@ -2286,6 +2294,7 @@ if __name__ == '__main__':
'continuedl': opts.continue_dl, 'continuedl': opts.continue_dl,
'noprogress': opts.noprogress, 'noprogress': opts.noprogress,
'playliststart': opts.playliststart, 'playliststart': opts.playliststart,
'playlistend': opts.playlistend,
'logtostderr': opts.outtmpl == '-', 'logtostderr': opts.outtmpl == '-',
}) })
fd.add_info_extractor(youtube_search_ie) fd.add_info_extractor(youtube_search_ie)