Add deduplicate conflict mode to only skip actual duplicates

organize/actions/common/conflict.py

@@ -2,6 +2,7 @@
 
 from pathlib import Path
 from typing import TYPE_CHECKING, Literal, NamedTuple
+import filecmp
 
 from organize.output import Output
 from organize.resource import Resource
@@ -11,7 +12,7 @@
     from jinja2 import Template
 
 # TODO: keep_newer, keep_older, keep_bigger, keep_smaller
-ConflictMode = Literal["skip", "overwrite", "trash", "rename_new", "rename_existing"]
+ConflictMode = Literal["skip", "overwrite", "deduplicate", "trash", "rename_new", "rename_existing"]
 
 
 class ConflictResult(NamedTuple):
@@ -103,6 +104,17 @@ def _print(msg: str):
 
             delete(path=dst)
         return ConflictResult(skip_action=False, use_dst=dst)
+
+    elif conflict_mode == "deduplicate":
+        if filecmp.cmp(res.path, dst, shallow=True):
+            _print(f"Duplicate skipped.")
+            return ConflictResult(skip_action=True, use_dst=res.path)
+        else:
+            new_path = next_free_name(
+                dst=dst,
+                template=rename_template,
+            )
+            return ConflictResult(skip_action=False, use_dst=new_path)
 
     elif conflict_mode == "rename_new":
         new_path = next_free_name(