From 4340decad25e264863e27538847e17918b4c1ae2 Mon Sep 17 00:00:00 2001
From: Pierre
Date: Thu, 25 Sep 2014 19:37:20 +0300
Subject: check for overwriting files in the downloader (fixes #3916, closes
#3829)
---
youtube_dl/downloader/common.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
(limited to 'youtube_dl/downloader')
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py
index 584bde732..de6b9311d 100644
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dl/downloader/common.py
@@ -284,8 +284,19 @@ class FileDownloader(object):
"""Download to a filename using the info from info_dict
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
- 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._hook_progress({
'filename': filename,
--
cgit v1.2.3