Fix issue with overwriting files

diff --git a/youtube_dlc/YoutubeDL.py b/youtube_dlc/YoutubeDL.py
index 8aa0b7fbdfba0fd44d2ceb5a5e25255943d5c46d..50eaf235cb4babe54acf49c810f9f6ff667ddfb6 100644 (file)
--- a/youtube_dlc/YoutubeDL.py
+++ b/youtube_dlc/YoutubeDL.py
@@ -447,6 +447,9 @@ def check_deprecated(param, option, suggestion):
                 self.report_warning('--merge-output-format will be ignored since --remux-video or --recode-video is given')
             self.params['merge_output_format'] = self.params['final_ext']
 
+        if 'overwrites' in self.params and self.params['overwrites'] is None:
+            del self.params['overwrites']
+
         check_deprecated('autonumber_size', '--autonumber-size', 'output template with %(autonumber)0Nd, where N in the number of digits')
         check_deprecated('autonumber', '--auto-number', '-o "%(autonumber)s-%(title)s.%(ext)s"')
         check_deprecated('usetitle', '--title', '-o "%(title)s-%(id)s.%(ext)s"')
@@ -1130,7 +1133,7 @@ def ensure_dir_exists(path):
                     'info.json', ie_result.get('ext'))
                 if not ensure_dir_exists(encodeFilename(infofn)):
                     return
-                if self.params.get('overwrites', True) and os.path.exists(encodeFilename(infofn)):
+                if not self.params.get('overwrites', True) and os.path.exists(encodeFilename(infofn)):
                     self.to_screen('[info] Playlist metadata is already present')
                 else:
                     self.to_screen('[info] Writing playlist metadata as JSON to: ' + infofn)

diff --git a/youtube_dlc/downloader/common.py b/youtube_dlc/downloader/common.py
index ff72f52d1b7280c849bded30be99f6a7dae5b21e..f7e7955aae1302f1366dd0a53cad79c77800b257 100644 (file)
--- a/youtube_dlc/downloader/common.py
+++ b/youtube_dlc/downloader/common.py
@@ -332,7 +332,7 @@ def download(self, filename, info_dict, subtitle=False):
         """
 
         nooverwrites_and_exists = (
-            not self.params.get('overwrites', True)
+            not self.params.get('overwrites', subtitle)
             and os.path.exists(encodeFilename(filename))
         )