fix: errors in DupeFilesRegistry (#1233)

This commit is contained in:
Jann Stute
2026-01-22 07:22:16 +01:00
committed by GitHub
parent 57849bf4d5
commit 97c9d34186

View File

@@ -7,6 +7,7 @@ import structlog
from tagstudio.core.library.alchemy.enums import BrowsingState
from tagstudio.core.library.alchemy.library import Library
from tagstudio.core.library.alchemy.models import Entry
from tagstudio.core.utils.types import unwrap
logger = structlog.get_logger()
@@ -28,7 +29,7 @@ class DupeFilesRegistry:
A duplicate file is defined as an identical or near-identical file as determined
by a DupeGuru results file.
"""
library_dir = self.library.library_dir
library_dir = unwrap(self.library.library_dir)
if not isinstance(results_filepath, Path):
results_filepath = Path(results_filepath)
@@ -43,7 +44,7 @@ class DupeFilesRegistry:
files: list[Entry] = []
for element in group:
if element.tag == "file":
file_path = Path(element.attrib.get("path"))
file_path = Path(unwrap(element.attrib.get("path")))
try:
path_relative = file_path.relative_to(library_dir)
@@ -82,5 +83,5 @@ class DupeFilesRegistry:
for i, entries in enumerate(self.groups):
remove_ids = entries[1:]
logger.info("Removing entries group", ids=remove_ids)
self.library.remove_entries(remove_ids)
self.library.remove_entries([e.id for e in remove_ids])
yield i - 1 # The -1 waits for the next step to finish