delayed-rm 2.9.1__tar.gz → 2.9.3__tar.gz

{delayed_rm-2.9.1 → delayed_rm-2.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: delayed_rm
-Version: 2.9.1
+Version: 2.9.3
 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.1 → delayed_rm-2.9.3}/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.1"
+__version__ = "2.9.3"
 
 
 #
@@ -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:
@@ -230,25 +229,20 @@ def delayed_rm_raw(delay: int, log: bool, r: bool, f: bool, paths: list[Path]) -
     return True
 
 
-def main(prog: str, *args: str) -> bool:
-    base: str = os.path.basename(prog)
-    parser = argparse.ArgumentParser(prog=base)
-    parser.add_argument("--version", action="version", version=f"{base} {__version__}")
+def cli() -> None:
+    """
+    delayed_rm CLI
+    """
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--version", action="version", version=f"{parser.prog} {__version__}")
     parser.add_argument("--delay", "--ttl", type=int, default=900, help="The deletion delay in seconds")
     parser.add_argument(
-        "--log", action="store_true", help=f"Show {base}'s log files; may not be used with other arguments"
+        "--log", action="store_true", help=f"Show {parser.prog}'s log files; may not be used with other arguments"
     )
     parser.add_argument("-r", action="store_true", help="rm -r; must use -f with this")
     parser.add_argument("-f", action="store_true", help="rm -f; must use -r with this")
     parser.add_argument("paths", type=Path, nargs="*", help="The items to delete")
-    return not delayed_rm_raw(**vars(parser.parse_args(args)))
-
-
-def cli() -> None:
-    """
-    delayed_rm CLI
-    """
-    sys.exit(main(*sys.argv))
+    sys.exit(not delayed_rm_raw(**vars(parser.parse_args())))
 
 
 #
@@ -259,12 +253,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.1 → delayed_rm-2.9.3}/delayed_rm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: delayed_rm
-Version: 2.9.1
+Version: 2.9.3
 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