New option --skip-download (Closes #162)
This commit is contained in:
parent
f3098c4d8a
commit
9b4556c469
13
youtube-dl
13
youtube-dl
@ -697,8 +697,7 @@ class FileDownloader(object):
|
|||||||
def process_info(self, info_dict):
|
def process_info(self, info_dict):
|
||||||
"""Process a single dictionary returned by an InfoExtractor."""
|
"""Process a single dictionary returned by an InfoExtractor."""
|
||||||
filename = self.prepare_filename(info_dict)
|
filename = self.prepare_filename(info_dict)
|
||||||
# Do nothing else if in simulate mode
|
|
||||||
if self.params.get('simulate', False):
|
|
||||||
# Forced printings
|
# Forced printings
|
||||||
if self.params.get('forcetitle', False):
|
if self.params.get('forcetitle', False):
|
||||||
print info_dict['title'].encode(preferredencoding(), 'xmlcharrefreplace')
|
print info_dict['title'].encode(preferredencoding(), 'xmlcharrefreplace')
|
||||||
@ -711,6 +710,8 @@ class FileDownloader(object):
|
|||||||
if self.params.get('forcefilename', False) and filename is not None:
|
if self.params.get('forcefilename', False) and filename is not None:
|
||||||
print filename.encode(preferredencoding(), 'xmlcharrefreplace')
|
print filename.encode(preferredencoding(), 'xmlcharrefreplace')
|
||||||
|
|
||||||
|
# Do nothing else if in simulate mode
|
||||||
|
if self.params.get('simulate', False):
|
||||||
return
|
return
|
||||||
|
|
||||||
if filename is None:
|
if filename is None:
|
||||||
@ -769,6 +770,7 @@ class FileDownloader(object):
|
|||||||
self.trouble(u'ERROR: Cannot write metadata to JSON file ' + infofn)
|
self.trouble(u'ERROR: Cannot write metadata to JSON file ' + infofn)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if not self.params.get('skip_download', False):
|
||||||
try:
|
try:
|
||||||
success = self._do_download(filename, info_dict['url'].encode('utf-8'), info_dict.get('player_url', None))
|
success = self._do_download(filename, info_dict['url'].encode('utf-8'), info_dict.get('player_url', None))
|
||||||
except (OSError, IOError), err:
|
except (OSError, IOError), err:
|
||||||
@ -3495,7 +3497,9 @@ def parseOpts():
|
|||||||
verbosity.add_option('-q', '--quiet',
|
verbosity.add_option('-q', '--quiet',
|
||||||
action='store_true', dest='quiet', help='activates quiet mode', default=False)
|
action='store_true', dest='quiet', help='activates quiet mode', default=False)
|
||||||
verbosity.add_option('-s', '--simulate',
|
verbosity.add_option('-s', '--simulate',
|
||||||
action='store_true', dest='simulate', help='do not download video', default=False)
|
action='store_true', dest='simulate', help='do not download the video and do not write anything to disk', default=False)
|
||||||
|
verbosity.add_option('--skip-download',
|
||||||
|
action='store_true', dest='skip_download', help='do not download the video', default=False)
|
||||||
verbosity.add_option('-g', '--get-url',
|
verbosity.add_option('-g', '--get-url',
|
||||||
action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
|
action='store_true', dest='geturl', help='simulate, quiet but print URL', default=False)
|
||||||
verbosity.add_option('-e', '--get-title',
|
verbosity.add_option('-e', '--get-title',
|
||||||
@ -3693,7 +3697,8 @@ def main():
|
|||||||
'forcethumbnail': opts.getthumbnail,
|
'forcethumbnail': opts.getthumbnail,
|
||||||
'forcedescription': opts.getdescription,
|
'forcedescription': opts.getdescription,
|
||||||
'forcefilename': opts.getfilename,
|
'forcefilename': opts.getfilename,
|
||||||
'simulate': (opts.simulate or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename),
|
'simulate': opts.simulate,
|
||||||
|
'skip_download': (opts.skip_download or opts.simulate or opts.geturl or opts.gettitle or opts.getthumbnail or opts.getdescription or opts.getfilename),
|
||||||
'format': opts.format,
|
'format': opts.format,
|
||||||
'format_limit': opts.format_limit,
|
'format_limit': opts.format_limit,
|
||||||
'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
|
'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(preferredencoding()))
|
||||||
|
Loading…
Reference in New Issue
Block a user