R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added new parameter --playlist-prompt

Browse Source
This commit is contained in:
Thomas Christlieb 2017-02-15 09:24:15 +01:00
parent 70bcc444a9
commit e9109f6735
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
youtube_dl/YoutubeDL.py
View File

@ -39,6 +39,7 @@ from .compat import (
compat_urllib_error, compat_urllib_error,
compat_urllib_request, compat_urllib_request,
compat_urllib_request_DataHandler, compat_urllib_request_DataHandler,
compat_input,
) )
from .utils import ( from .utils import (
age_restricted, age_restricted,
@ -848,7 +849,6 @@ class YoutubeDL(object):
random.shuffle(entries) random.shuffle(entries)
for i, entry in enumerate(entries, 1): for i, entry in enumerate(entries, 1):
self.to_screen('[download] Downloading video %s of %s' % (i, n_entries))
extra = { extra = {
'n_entries': n_entries, 'n_entries': n_entries,
'playlist': playlist, 'playlist': playlist,
@ -861,6 +861,31 @@ class YoutubeDL(object):
'extractor_key': ie_result['extractor_key'], 'extractor_key': ie_result['extractor_key'],
} }
if self.params.get('playlistprompt', False):
skipnextvid = False
desc = entry.get('title', entry.get('id', ''))
if not desc:
entry_result = self.process_ie_result(entry,
download=False,
extra_info=extra)
desc = entry_result.get('title', entry_result.get('id', ''))
if desc:
while True:
self.to_screen('Do you want to download video %s/%s: "%s"? (Y/n) ' %
(i, n_entries, desc), skip_eol=True)
answer = compat_input().lower()
if answer == 'n':
skipnextvid = True
break
elif answer == 'y' or answer == '':
skipnextvid = False
break
if skipnextvid:
continue
self.to_screen('[download] Downloading video %s of %s' % (i, n_entries))
reason = self._match_entry(entry, incomplete=True) reason = self._match_entry(entry, incomplete=True)
if reason is not None: if reason is not None:
self.to_screen('[download] ' + reason) self.to_screen('[download] ' + reason)
@ -870,6 +895,7 @@ class YoutubeDL(object):
download=download, download=download,
extra_info=extra) extra_info=extra)
playlist_results.append(entry_result) playlist_results.append(entry_result)
ie_result['entries'] = playlist_results ie_result['entries'] = playlist_results
self.to_screen('[download] Finished downloading playlist: %s' % playlist) self.to_screen('[download] Finished downloading playlist: %s' % playlist)
return ie_result return ie_result

1
youtube_dl/__init__.py
View File

@ -345,6 +345,7 @@ def _real_main(argv=None):
'playlistend': opts.playlistend, 'playlistend': opts.playlistend,
'playlistreverse': opts.playlist_reverse, 'playlistreverse': opts.playlist_reverse,
'playlistrandom': opts.playlist_random, 'playlistrandom': opts.playlist_random,
'playlistprompt': opts.playlist_prompt,
'noplaylist': opts.noplaylist, 'noplaylist': opts.noplaylist,
'logtostderr': opts.outtmpl == '-', 'logtostderr': opts.outtmpl == '-',
'consoletitle': opts.consoletitle, 'consoletitle': opts.consoletitle,

4
youtube_dl/options.py
View File

@ -474,6 +474,10 @@ def parseOpts(overrideArguments=None):
'--playlist-random', '--playlist-random',
action='store_true', action='store_true',
help='Download playlist videos in random order') help='Download playlist videos in random order')
downloader.add_option(
'--playlist-prompt',
action='store_true',
help='Ask for each playlist file to download')
downloader.add_option( downloader.add_option(
'--xattr-set-filesize', '--xattr-set-filesize',
dest='xattr_set_filesize', action='store_true', dest='xattr_set_filesize', action='store_true',