check for overwriting files in the downloader (fixes #3916, closes #3829)

pull/8/head
Pierre 10 years ago committed by Jaime Marquínez Ferrándiz
parent f3ff1a3696
commit 4340decad2

@ -1121,9 +1121,6 @@ class YoutubeDL(object):
(info_dict['thumbnail'], compat_str(err))) (info_dict['thumbnail'], compat_str(err)))
if not self.params.get('skip_download', False): if not self.params.get('skip_download', False):
if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(filename)):
success = True
else:
try: try:
def dl(name, info): def dl(name, info):
fd = get_suitable_downloader(info)(self, self.params) fd = get_suitable_downloader(info)(self, self.params)

@ -284,8 +284,19 @@ class FileDownloader(object):
"""Download to a filename using the info from info_dict """Download to a filename using the info from info_dict
Return True on success and False otherwise Return True on success and False otherwise
""" """
nooverwrites_and_exists = (
self.params.get('nooverwrites', False)
and os.path.exists(encodeFilename(filename))
)
continuedl_and_exists = (
self.params.get('continuedl', False)
and os.path.isfile(encodeFilename(filename))
and not self.params.get('nopart', False)
)
# Check file already present # Check file already present
if filename != '-' and self.params.get('continuedl', False) and os.path.isfile(encodeFilename(filename)) and not self.params.get('nopart', False): if filename != '-' and nooverwrites_and_exists or continuedl_and_exists:
self.report_file_already_downloaded(filename) self.report_file_already_downloaded(filename)
self._hook_progress({ self._hook_progress({
'filename': filename, 'filename': filename,

Loading…
Cancel
Save