Merge pull request #10021 from pymedusa/release/release-0.5.20

Release/release 0.5.20

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.20 (02-11-2021)
+
+#### Fixes
+- Restore original behavior when processing files and folders ([10020](https://github.com/pymedusa/Medusa/pull/10020))
+
+-----
+
 ## 0.5.19 (31-10-2021)
 
 #### New Features

medusa/common.py

@@ -39,7 +39,7 @@
 log.logger.addHandler(logging.NullHandler())
 
 INSTANCE_ID = text_type(uuid.uuid1())
-VERSION = '0.5.19'
+VERSION = '0.5.20'
 
 USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
     version=VERSION, system=platform.system(), release=platform.release(),

medusa/process_tv.py

@@ -415,7 +415,6 @@ def process(self, resource_name=None, force=False, is_priority=None, delete_on=F
 
     def _clean_up(self, path, proc_type, delete=False):
         """Clean up post-processed folder based on the checks below."""
-        # Always delete files if they are being moved or if it's explicitly wanted
         clean_folder = proc_type == 'manual' and delete
         if self.process_method == 'move' or clean_folder:
 
@@ -425,8 +424,9 @@ def _clean_up(self, path, proc_type, delete=False):
             if self.unwanted_files:
                 self.delete_files(path, self.unwanted_files)
 
-            if not app.NO_DELETE:
-                if self.delete_folder(path, check_empty=False):
+            if not app.NO_DELETE or clean_folder:
+                check_empty = False if clean_folder else True
+                if self.delete_folder(path, check_empty=check_empty):
                     self.log_and_output('Deleted folder: {path}', level=logging.DEBUG, **{'path': path})
 
     def should_process(self, path):

medusa/server/api/v1/core.py

@@ -1294,7 +1294,7 @@ class CMD_PostProcess(ApiCall):
             'return_data': {'desc': 'Returns the result of the post-process'},
             'process_method': {'desc': 'How should valid post-processed files be handled'},
             'is_priority': {'desc': 'Replace the file even if it exists in a higher quality'},
-            'delete_files': {'desc': 'Delete files and folders like auto processing'},
+            'delete_files': {'desc': 'Delete files and folders'},
             'failed': {'desc': 'Mark download as failed'},
             'type': {'desc': 'The type of post-process being requested'},
         }

themes-default/slim/src/components/manual-post-process.vue

@@ -29,7 +29,7 @@
                     </config-toggle-slider>
 
                     <config-toggle-slider v-model="deleteOn" label="Delete files and folders" id="deleteOn">
-                        <span class="smallhelp"><i>&nbsp;(Check this to delete files and folders like auto processing)</i></span>
+                        <span class="smallhelp"><i>&nbsp;(Check this to delete files and folders)</i></span>
                     </config-toggle-slider>
 
                     <config-toggle-slider :disabled="!search.general.failedDownloads.enabled" v-model="failed" label="Mark as failed" id="failed">