delayed-rm 2.9.0__tar.gz → 2.9.2__tar.gz

{delayed_rm-2.9.0 → delayed_rm-2.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: delayed_rm
-Version: 2.9.0
+Version: 2.9.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-2.9.0 → delayed_rm-2.9.2}/delayed_rm/delayed_rm.py

@@ -3,16 +3,16 @@ from collections import defaultdict
 from tempfile import gettempdir
 from datetime import datetime
 from pathlib import Path
+from os import environ
 import subprocess
 import argparse
 import tempfile
 import shutil
 import time
 import sys
-import os
 
 
-__version__ = "2.9.0"
+__version__ = "2.9.2"
 
 
 #
@@ -83,9 +83,8 @@ def _prep(paths: list[Path], rf: bool) -> list[Path]:
     # Normalize paths and error checking
     try:
         paths = [i.parent.resolve(strict=True) / i.name for i in paths]
-        # pathlib.stat does not support follow_symlinks until 3.10
-        if len(paths) != len({os.stat(i, follow_symlinks=False).st_ino for i in paths}):
-            raise RMError("duplicate items passed")
+        if len(paths) != len({i.stat(follow_symlinks=False).st_ino for i in paths}):
+            raise RMError("duplicate or hardlinked items passed")
     except (FileNotFoundError, RuntimeError) as e:
         raise RMError(e) from e
     for i in paths:
@@ -214,12 +213,7 @@ def delayed_rm_raw(delay: int, log: bool, r: bool, f: bool, paths: list[Path]) -
             if r or f or paths:
                 _eprint("--log may not be used with other arguments")
                 return False
-            if log_f.exists():
-                with log_f.open("r") as file:
-                    data: str = file.read()
-                print(data + f"Log file: {log_f}")
-            else:
-                print("Log is empty")
+            print(f"{log_f.read_text()}Log file: {log_f}" if log_f.exists() else "Log is empty")
             return True
         if not paths:
             _eprint("nothing to remove")
@@ -236,7 +230,7 @@ def delayed_rm_raw(delay: int, log: bool, r: bool, f: bool, paths: list[Path]) -
 
 
 def main(prog: str, *args: str) -> bool:
-    base: str = os.path.basename(prog)
+    base: str = Path(prog).name
     parser = argparse.ArgumentParser(prog=base)
     parser.add_argument("--version", action="version", version=f"{base} {__version__}")
     parser.add_argument("--delay", "--ttl", type=int, default=900, help="The deletion delay in seconds")
@@ -264,12 +258,12 @@ def cli() -> None:
 def _secret_cli():
     """
     This CLI is invoked on import and not will do nothing by default
-    This CLI will only active if argv was intentionally configured to do so
+    This CLI will only activate if argv was intentionally configured to do so
     This entrypoint is for the spawned process to act
     """
     try:
         if len(sys.argv) == 4 and sys.argv[1] == _Secret.value:
-            if os.environ.get(_Secret.key, None) == _Secret.value:
+            if environ.get(_Secret.key, None) == _Secret.value:
                 delay = int(sys.argv[2])
                 d = Path(sys.argv[3]).resolve()
                 time.sleep(delay)

{delayed_rm-2.9.0 → delayed_rm-2.9.2}/delayed_rm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: delayed_rm
-Version: 2.9.0
+Version: 2.9.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