This commit is contained in:
Daylin Morgan 2024-07-12 12:33:22 -05:00
parent 28c268b8f0
commit 852ce927c0
Signed by: daylin
GPG key ID: 950D13E9719334AD

View file

@ -3442,10 +3442,9 @@ class Viv:
if cli.is_file(): if cli.is_file():
to_remove_files.append(cli) to_remove_files.append(cli)
to_remove = to_remove_files + [ to_remove = sorted(
f for d in to_remove_dirs for f in d.glob("**/*") set(to_remove_dirs + to_remove_files), 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?",
"\n".join(f" - {a.red}{p}{a.end}" for p in to_remove) + "\n", "\n".join(f" - {a.red}{p}{a.end}" for p in to_remove) + "\n",
@ -3453,6 +3452,7 @@ class Viv:
): ):
for p in to_remove: for p in to_remove:
if p.is_dir(): if p.is_dir():
print(sorted(p.glob("**/*")))
shutil.rmtree(p) shutil.rmtree(p)
else: else:
p.unlink() p.unlink()