mirror of
https://github.com/daylinmorgan/viv.git
synced 2024-11-09 19:13:14 -06:00
dir!=files
This commit is contained in:
parent
247f80921d
commit
28c268b8f0
1 changed files with 10 additions and 6 deletions
|
@ -3427,20 +3427,24 @@ class Viv:
|
||||||
cli: Path,
|
cli: Path,
|
||||||
yes: bool,
|
yes: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
to_remove = []
|
to_remove_dirs = []
|
||||||
|
to_remove_files = []
|
||||||
if Cfg().cache_base.is_dir():
|
if Cfg().cache_base.is_dir():
|
||||||
to_remove.append(Cfg().cache_base)
|
to_remove_dirs.append(Cfg().cache_base)
|
||||||
if src.is_file():
|
if src.is_file():
|
||||||
to_remove.append(src.parent if src == (Cfg().src) else src)
|
to_remove_files.append(src.parent if src == (Cfg().src) else src)
|
||||||
if self.local_source and self.local_source.is_file():
|
if self.local_source and self.local_source.is_file():
|
||||||
if self.local_source.parent.name == "viv":
|
if self.local_source.parent.name == "viv":
|
||||||
to_remove.append(self.local_source.parent)
|
to_remove_files.append(self.local_source.parent)
|
||||||
else:
|
else:
|
||||||
to_remove.append(self.local_source)
|
to_remove_files.append(self.local_source)
|
||||||
|
|
||||||
if cli.is_file():
|
if cli.is_file():
|
||||||
to_remove.append(cli)
|
to_remove_files.append(cli)
|
||||||
|
|
||||||
|
to_remove = to_remove_files + [
|
||||||
|
f for d in to_remove_dirs for f in d.glob("**/*")
|
||||||
|
]
|
||||||
to_remove = sorted(set(to_remove), key=lambda p: p.is_file())
|
to_remove = sorted(set(to_remove), key=lambda p: p.is_file())
|
||||||
if confirm(
|
if confirm(
|
||||||
"Remove the above files/directories?",
|
"Remove the above files/directories?",
|
||||||
|
|
Loading…
Reference in a new issue