Merge pull request #738

v4.1.10

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v4.1.10
+
+### Fixes
+
+* Fix `doctor` command adding underscores to files that required no fixing when sanitizing paths
+
 ## v4.1.9
 
 ### Changes

digiarch/__version__.py

@@ -1 +1 @@
-__version__ = "4.1.9"
+__version__ = "4.1.10"

digiarch/commands/doctor.py

@@ -42,9 +42,19 @@ def sanitize_paths(ctx: Context, database: FileDB, root: Path, dry_run: bool, *l
         old_path: Path = file.relative_path
         new_path: Path = sanitize_path(old_path)
 
+        if new_path == old_path:
+            continue
+
         while file.root.joinpath(new_path).exists():
             new_path = new_path.with_name("_" + new_path.name)
 
+        event: HistoryEntry = HistoryEntry.command_history(
+            ctx,
+            "sanitize-path.rename",
+            file.uuid,
+            [str(file.relative_path), str(new_path)],
+        )
+
         if not dry_run:
             file.root.joinpath(new_path).parent.mkdir(parents=True, exist_ok=True)
             file.get_absolute_path().rename(file.root / new_path)
@@ -54,14 +64,6 @@ def sanitize_paths(ctx: Context, database: FileDB, root: Path, dry_run: bool, *l
             except BaseException:
                 file.get_absolute_path().rename(file.root / old_path)
                 raise
-
-        event: HistoryEntry = HistoryEntry.command_history(
-            ctx,
-            "sanitize-path.rename",
-            file.uuid,
-            [str(file.relative_path), str(new_path)],
-        )
-        if not dry_run:
             database.history.insert(event)
 
         event.log(INFO, *(log for log in loggers if log))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "digiarch"
-version = "4.1.9"
+version = "4.1.10"
 description = "Tools for the Digital Archive Project at Aarhus Stadsarkiv"
 authors = ["Aarhus Stadsarkiv <[email protected]>"]
 license = "GPL-3.0"