Merge remote-tracking branch 'upstream/master' into ben_dev

# Conflicts:
#	core.py
This commit is contained in:
benjamin
2020-12-24 12:36:58 +08:00

View File

@@ -30,6 +30,7 @@ def escape_path(path, escape_literals: str): # Remove escape literals
def moveFailedFolder(filepath, failed_folder): def moveFailedFolder(filepath, failed_folder):
if config.Config().failed_move():
root_path = str(pathlib.Path(filepath).parent) root_path = str(pathlib.Path(filepath).parent)
file_name = pathlib.Path(filepath).name file_name = pathlib.Path(filepath).name
destination_path = root_path + '/' + failed_folder + '/' destination_path = root_path + '/' + failed_folder + '/'