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

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

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

@@ -8,11 +8,12 @@ import subprocess
 import argparse
 import tempfile
 import shutil
+import math
 import time
 import sys
 
 
-__version__ = "2.9.2"
+__version__ = "2.10.0"
 
 
 #
@@ -51,6 +52,16 @@ class _Secret:
 #
 
 
+def _size(p: Path) -> str:
+    """
+    Get file size as a human readable string
+    """
+    s = p.stat().st_size
+    lg = int(math.log(s, 1000))
+    si = " KMGT"[lg].replace(" ", "")
+    return f"{round(s/(1000**lg))} {si}B"
+
+
 def _eprint(e: str | BaseException) -> None:
     """
     Print e to stderr
@@ -213,7 +224,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
-            print(f"{log_f.read_text()}Log file: {log_f}" if log_f.exists() else "Log is empty")
+            print(f"{log_f.read_text()}Log file ({_size(log_f)}): {log_f}" if log_f.exists() else "Log is empty")
             return True
         if not paths:
             _eprint("nothing to remove")
@@ -229,25 +240,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 = Path(prog).name
-    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())))
 
 
 #

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

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