delayed-rm 3.0.0__tar.gz → 3.0.2__tar.gz

{delayed_rm-3.0.0 → delayed_rm-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: delayed_rm
-Version: 3.0.0
+Version: 3.0.2
 Summary: Ever wish you had a few minutes to undo an rm? Now you do!
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/delayed_rm

{delayed_rm-3.0.0 → delayed_rm-3.0.2}/delayed_rm/delayed_rm.py

@@ -13,7 +13,7 @@ import time
 import sys
 
 # Constants
-__version__ = "3.0.0"
+__version__ = "3.0.2"
 _UNSAFE_FLAG = "unsafe-rmtree"
 log_f: Path = Path.home().resolve() / ".delayed_rm.log"
 tmp_d: Path = Path(gettempdir()).resolve() / ".delayed_rm"
@@ -185,8 +185,8 @@ def delayed_rm(paths: list[Path], delay: int, rf: bool, unsafe: bool = False) ->
                         shutil.rmtree(p)
                     else:
                         copy3(p, new)
-                        edited = True
                         p.unlink()
+                        edited = True
                 success.append(p)
                 full_where[p] = new
                 where[p.name].add(out_d)
@@ -195,18 +195,18 @@ def delayed_rm(paths: list[Path], delay: int, rf: bool, unsafe: bool = False) ->
                 _print_exc(e)
                 if edited:
                     _print_stderr(f"WARNING: Contents of {p} may have been PARTIALLY delayed_rm'd")
-                    continue
-                if _copytree:
-                    if output := _rmtree(new):
-                        _print_stderr(output)
-                    continue
-                new.unlink()
+                elif not new.exists(follow_symlinks=False):
+                    pass
+                elif not _copytree:
+                    new.unlink()
+                elif output := _rmtree(new):
+                    _print_stderr(output)
             finally:
                 any_edited |= edited
     except KeyboardInterrupt:
         ctrlc = True
     # Inform user of failures
-    failed_plus: list[str] = [str(i) for i in failed]
+    failed_plus: list[str] = list(map(str, failed))
     if len(failed) > 0 and not ctrlc:
         _print_exc(OSError("failed to rm:\n  " + "\n  ".join(failed_plus)))
     # Log result

{delayed_rm-3.0.0 → delayed_rm-3.0.2}/delayed_rm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: delayed_rm
-Version: 3.0.0
+Version: 3.0.2
 Summary: Ever wish you had a few minutes to undo an rm? Now you do!
 License: GPLv3
 Project-URL: Homepage, https://github.com/zwimer/delayed_rm