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

Add playlist sequence number as field 'seq_index' for YouTube playlists; the output format %(seq_index)s is usable

Browse Source
This commit is contained in:
Craig Markwardt 2013-03-08 02:57:12 -05:00
parent c2e21f2f0d
commit 7843cf09e8
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/FileDownloader.py
View File

@ -390,7 +390,7 @@ class FileDownloader(object):
return u'"' + title + '" title matched reject pattern "' + rejecttitle + '"'
return None
def process_info(self, info_dict):
def process_info(self, info_dict, seq_index=0):
"""Process a single dictionary returned by an InfoExtractor."""
# Keep for backwards compatibility
@ -399,6 +399,8 @@ class FileDownloader(object):
if not 'format' in info_dict:
info_dict['format'] = info_dict['ext']
info_dict['seq_index'] = compat_str(seq_index)
reason = self._match_entry(info_dict)
if reason is not None:
self.to_screen(u'[download] ' + reason)
@ -494,7 +496,7 @@ class FileDownloader(object):
self.trouble(u'ERROR: postprocessing: %s' % str(err))
return
def download(self, url_list):
def download(self, url_list, seq_index=0):
"""Download a given list of URLs."""
if len(url_list) > 1 and self.fixed_template():
raise SameFileError(self.params['outtmpl'])
@ -534,7 +536,7 @@ class FileDownloader(object):
video['extractor'] = ie.IE_NAME
try:
self.increment_downloads()
self.process_info(video)
self.process_info(video, seq_index=seq_index)
except UnavailableVideoError:
self.trouble(u'\nERROR: unable to download video')

4
youtube_dl/InfoExtractors.py
View File

@ -1756,8 +1756,10 @@ class YoutubePlaylistIE(InfoExtractor):
else:
self._downloader.to_screen(u'[youtube] PL %s: Found %i videos, downloading %i' % (playlist_id, total, len(videos)))
seq_index = playliststart + 1
for video in videos:
self._downloader.download([video])
self._downloader.download([video], seq_index=seq_index)
seq_index += 1
return

2
youtube_dl/__init__.py
View File

@ -222,7 +222,7 @@ def parseOpts():
action='store_true', dest='autonumber',
help='number downloaded files starting from 00000', default=False)
filesystem.add_option('-o', '--output',
dest='outtmpl', metavar='TEMPLATE', help='output filename template. Use %(title)s to get the title, %(uploader)s for the uploader name, %(uploader_id)s for the uploader nickname if different, %(autonumber)s to get an automatically incremented number, %(ext)s for the filename extension, %(upload_date)s for the upload date (YYYYMMDD), %(extractor)s for the provider (youtube, metacafe, etc), %(id)s for the video id and %% for a literal percent. Use - to output to stdout. Can also be used to download to a different directory, for example with -o \'/my/downloads/%(uploader)s/%(title)s-%(id)s.%(ext)s\' .')
dest='outtmpl', metavar='TEMPLATE', help='output filename template. Use %(title)s to get the title, %(uploader)s for the uploader name, %(uploader_id)s for the uploader nickname if different, %(autonumber)s to get an automatically incremented number, %(ext)s for the filename extension, %(upload_date)s for the upload date (YYYYMMDD), %(extractor)s for the provider (youtube, metacafe, etc), %(id)s for the video id, %(seq_index)s for the playlist sequence number (0 if not a playlist), and %% for a literal percent. Use - to output to stdout. Can also be used to download to a different directory, for example with -o \'/my/downloads/%(uploader)s/%(title)s-%(id)s.%(ext)s\' .')
filesystem.add_option('--restrict-filenames',
action='store_true', dest='restrictfilenames',
help='Restrict filenames to only ASCII characters, and avoid "&" and spaces in filenames', default=False)