From 989032fe0c3b90aa5c034657ade7df54b1b2016f Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 15 May 2021 22:25:41 +0200 Subject: [PATCH] Fix cookies getting deleted --- PFERD/output_dir.py | 2 +- PFERD/report.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/PFERD/output_dir.py b/PFERD/output_dir.py index 4f5f708..fa0944b 100644 --- a/PFERD/output_dir.py +++ b/PFERD/output_dir.py @@ -378,7 +378,7 @@ class OutputDirectory: pass async def _cleanup_file(self, path: Path, pure: PurePath) -> None: - if self._report.marked(pure): + if self._report.is_marked(pure): return if await self._conflict_delete_lf(self._on_conflict, pure): diff --git a/PFERD/report.py b/PFERD/report.py index 2c7d8af..1c46216 100644 --- a/PFERD/report.py +++ b/PFERD/report.py @@ -62,7 +62,7 @@ class Report: detail, see the respective exception's docstring. """ - for other in self.known_files & self.reserved_files: + for other in self.marked: if path == other: raise MarkDuplicateException(path) @@ -71,8 +71,12 @@ class Report: self.known_files.add(path) - def marked(self, path: PurePath) -> bool: - return path in self.known_files + @property + def marked(self) -> Set[PurePath]: + return self.known_files | self.reserved_files + + def is_marked(self, path: PurePath) -> bool: + return path in self.marked def add_file(self, path: PurePath) -> None: """