From 0f5e55648be99b73fbe349ecc6a97b110d8dbe66 Mon Sep 17 00:00:00 2001 From: I-Al-Istannen Date: Sat, 5 Dec 2020 14:11:51 +0100 Subject: [PATCH] Tell user when the conflict resolver kept existing files --- PFERD/organizer.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PFERD/organizer.py b/PFERD/organizer.py index 1038ae7..a15e751 100644 --- a/PFERD/organizer.py +++ b/PFERD/organizer.py @@ -141,6 +141,7 @@ class Organizer(Location): prompt = f"Overwrite file {dst_absolute}?" conflict = ConflictType.FILE_OVERWRITTEN if not self._resolve_conflict(prompt, dst_absolute, conflict, default=True): + PRETTY.ignored_file(dst_absolute, "user conflict resolution") return None self.download_summary.add_modified_file(dst_absolute) @@ -203,6 +204,8 @@ class Organizer(Location): if self._resolve_conflict(prompt, path, ConflictType.FILE_DELETED, default=False): self.download_summary.add_deleted_file(path) path.unlink() + else: + PRETTY.ignored_file(path, "user conflict resolution") def _resolve_conflict( self, prompt: str, path: Path, conflict: ConflictType, default: bool