|
|
@ -192,6 +192,7 @@ class FileDownloader(object):
|
|
|
|
ratelimit: Download speed limit, in bytes/sec.
|
|
|
|
ratelimit: Download speed limit, in bytes/sec.
|
|
|
|
nooverwrites: Prevent overwriting files.
|
|
|
|
nooverwrites: Prevent overwriting files.
|
|
|
|
continuedl: Try to continue downloads if possible.
|
|
|
|
continuedl: Try to continue downloads if possible.
|
|
|
|
|
|
|
|
noprogress: Do not print the progress bar.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
|
|
params = None
|
|
|
|
params = None
|
|
|
@ -350,6 +351,8 @@ class FileDownloader(object):
|
|
|
|
|
|
|
|
|
|
|
|
def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
|
|
|
|
def report_progress(self, percent_str, data_len_str, speed_str, eta_str):
|
|
|
|
"""Report download progress."""
|
|
|
|
"""Report download progress."""
|
|
|
|
|
|
|
|
if self.params.get('noprogress', False):
|
|
|
|
|
|
|
|
return
|
|
|
|
self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
|
|
|
|
self.to_stdout(u'\r[download] %s of %s at %s ETA %s' %
|
|
|
|
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
|
|
|
|
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
|
|
|
|
|
|
|
|
|
|
|
@ -370,6 +373,9 @@ class FileDownloader(object):
|
|
|
|
|
|
|
|
|
|
|
|
def report_finish(self):
|
|
|
|
def report_finish(self):
|
|
|
|
"""Report download finished."""
|
|
|
|
"""Report download finished."""
|
|
|
|
|
|
|
|
if self.params.get('noprogress', False):
|
|
|
|
|
|
|
|
self.to_stdout(u'[download] Download completed')
|
|
|
|
|
|
|
|
else:
|
|
|
|
self.to_stdout(u'')
|
|
|
|
self.to_stdout(u'')
|
|
|
|
|
|
|
|
|
|
|
|
def process_info(self, info_dict):
|
|
|
|
def process_info(self, info_dict):
|
|
|
@ -1558,6 +1564,8 @@ if __name__ == '__main__':
|
|
|
|
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',
|
|
|
|
action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
|
|
|
|
action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
|
|
|
|
|
|
|
|
verbosity.add_option('--no-progress',
|
|
|
|
|
|
|
|
action='store_true', dest='noprogress', help='do not print progress bar', default=False)
|
|
|
|
parser.add_option_group(verbosity)
|
|
|
|
parser.add_option_group(verbosity)
|
|
|
|
|
|
|
|
|
|
|
|
filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
|
|
|
|
filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
|
|
|
@ -1633,6 +1641,7 @@ if __name__ == '__main__':
|
|
|
|
'ratelimit': opts.ratelimit,
|
|
|
|
'ratelimit': opts.ratelimit,
|
|
|
|
'nooverwrites': opts.nooverwrites,
|
|
|
|
'nooverwrites': opts.nooverwrites,
|
|
|
|
'continuedl': opts.continue_dl,
|
|
|
|
'continuedl': opts.continue_dl,
|
|
|
|
|
|
|
|
'noprogress': opts.noprogress,
|
|
|
|
})
|
|
|
|
})
|
|
|
|
fd.add_info_extractor(youtube_search_ie)
|
|
|
|
fd.add_info_extractor(youtube_search_ie)
|
|
|
|
fd.add_info_extractor(youtube_pl_ie)
|
|
|
|
fd.add_info_extractor(youtube_pl_ie)
|
|
|
|