From 93e6329901b83b80ccc2ec339431d2bf2e0d07f6 Mon Sep 17 00:00:00 2001 From: I-Al-Istannen Date: Sun, 6 Dec 2020 13:28:08 +0100 Subject: [PATCH] Use the least destructive conflict resolver if there are multiple --- sync_url.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sync_url.py b/sync_url.py index fe0b3c4..c6db255 100755 --- a/sync_url.py +++ b/sync_url.py @@ -129,12 +129,12 @@ def main() -> None: return element not in [IliasElementType.VIDEO_FILE, IliasElementType.VIDEO_FOLDER] return True - if args.remote_first: - file_confilict_resolver: FileConflictResolver = _resolve_remote_first - elif args.local_first: - file_confilict_resolver = _resolve_local_first + if args.local_first: + file_confilict_resolver: FileConflictResolver = _resolve_local_first elif args.no_delete: file_confilict_resolver = _resolve_no_delete + elif args.remote_first: + file_confilict_resolver = _resolve_remote_first else: file_confilict_resolver = resolve_prompt_user