mirror of
https://github.com/Garmelon/PFERD.git
synced 2023-12-21 10:23:01 +01:00
Fix output dir
I missed these while renaming the resolve function. Shame on me for not running mypy earlier.
This commit is contained in:
parent
a673ab0fae
commit
0c9167512c
@ -86,7 +86,7 @@ class OutputDirectory:
|
||||
|
||||
self._report = Report()
|
||||
|
||||
def register_reserved(self, path: PurePath):
|
||||
def register_reserved(self, path: PurePath) -> None:
|
||||
self._report.mark_reserved(path)
|
||||
|
||||
def _mark(self, path: PurePath) -> None:
|
||||
@ -265,7 +265,7 @@ class OutputDirectory:
|
||||
heuristics = Heuristics(mtime)
|
||||
redownload = self._redownload if redownload is None else redownload
|
||||
on_conflict = self._on_conflict if on_conflict is None else on_conflict
|
||||
local_path = self._resolve(path)
|
||||
local_path = self.resolve(path)
|
||||
|
||||
self._mark(path)
|
||||
|
||||
@ -281,7 +281,7 @@ class OutputDirectory:
|
||||
|
||||
# Detect and solve local-file-remote-dir conflict
|
||||
for parent in path.parents:
|
||||
local_parent = self._resolve(parent)
|
||||
local_parent = self.resolve(parent)
|
||||
if local_parent.exists() and not local_parent.is_dir():
|
||||
if await self._conflict_lfrd(on_conflict, path, parent):
|
||||
local_parent.unlink()
|
||||
|
Loading…
Reference in New Issue
Block a user