delayed-rm 2.4.1__tar.gz → 2.7.0__tar.gz

{delayed_rm-2.4.1 → delayed_rm-2.7.0}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: delayed_rm
-Version: 2.4.1
+Version: 2.7.0
 Summary: Ever wish you had a few minutes to undo an rm? Now you do!
 Home-page: https://github.com/zwimer/delayed_rm
 License: GPL
+Project-URL: Homepage, https://github.com/zwimer/delayed_rm
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
@@ -11,7 +12,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 
 # delayed\_rm
-Ever wish you had a few minutes to undo an rm? Now you do! 
+Ever wish you had a few minutes to undo an rm? Now you do!
 
 # Usage
 

{delayed_rm-2.4.1 → delayed_rm-2.7.0}/README.md

@@ -1,5 +1,5 @@
 # delayed\_rm
-Ever wish you had a few minutes to undo an rm? Now you do! 
+Ever wish you had a few minutes to undo an rm? Now you do!
 
 # Usage
 

{delayed_rm-2.4.1 → delayed_rm-2.7.0}/delayed_rm/delayed_rm.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 from collections import defaultdict
-from typing import Callable, Set
 from tempfile import gettempdir
 from datetime import datetime
+from typing import Callable
 from pathlib import Path
 import subprocess
 import argparse
@@ -13,7 +13,7 @@ import sys
 import os
 
 
-__version__ = "2.4.1"
+__version__ = "2.7.0"
 
 
 #
@@ -42,6 +42,7 @@ class _Secret:
     Contains a string needed to activate the secret CLI
     Users should *not* use this, it is an internal class!
     """
+
     key: str = "DELAYED_RM_SECRET_CLI"
     value: str = "cL5r0!L4hmWmonW7k^RZM*4nq7mR&yfF"
 
@@ -58,8 +59,11 @@ def _eprint(e: str | BaseException) -> None:
     e2: str | BaseException = e
     if isinstance(e, RMError) and isinstance(e.__cause__, BaseException):
         e2 = e.__cause__
-    err: str = "Error" if isinstance(e2, RMError) or not isinstance(e, BaseException) else \
-        str(type(e2)).split("'")[1].split("delayed_rm.")[-1]
+    err: str = (
+        "Error"
+        if isinstance(e2, RMError) or not isinstance(e, BaseException)
+        else str(type(e2)).split("'")[1].split("delayed_rm.")[-1]
+    )
     print(f"{err}: {e}", file=sys.stderr)
 
 
@@ -79,7 +83,7 @@ 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 ]
+        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")
@@ -120,64 +124,82 @@ def delayed_rm(paths: list[Path], delay: int, rf: bool) -> bool:
     # Init data structures
     success: list[Path] = []
     failed: list[Path] = []
-    out_dirs: Set[Path] = { _mkdir(base / "0") }
-    where: dict[str, Set[Path]] = defaultdict(set)
+    out_dirs: set[Path] = {_mkdir(base / "0")}
+    where: dict[str, set[Path]] = defaultdict(set)
     full_where: dict[Path, Path] = {}
     # Delete files
-    for p in paths:
-        # Select an output directory that an item of name p.name does not exist
-        outd: Path
-        if len(out_dirs) != len(where[p.name]):
-            outd = next(iter(out_dirs - where[p.name]))
-        else:
-            outd = _mkdir(base / str(len(out_dirs)))
-            out_dirs.add(outd)
-        # Move file into the temp directory
-        try:
-            new: Path = outd / p.name
+    ctrlc = False
+    edited = False
+    try:
+        for p in paths:
+            # Select an output directory that an item of name p.name does not exist
+            outd: Path
+            if len(out_dirs) != len(where[p.name]):
+                outd = next(iter(out_dirs - where[p.name]))
+            else:
+                outd = _mkdir(base / str(len(out_dirs)))
+                out_dirs.add(outd)
+            # Move file into the temp directory
             try:
-                p.rename(new)
-            except OSError:
-                copyf = lambda src, dst: shutil.copy2(src, dst, follow_symlinks=False)
-                if p.is_dir():
-                    shutil.copytree(p, new, copy_function=copyf, symlinks=False)
-                    shutil.rmtree(p)
-                else:
-                    copyf(p, new)
-                    p.unlink()
-            full_where[p] = new
-            where[p.name].add(outd)
-            success.append(p)
-        except OSError as e:
-            failed.append(p)
-            _eprint(e)
+                new: Path = outd / p.name
+                try:
+                    p.rename(new)
+                except OSError:
+                    copyf = lambda src, dst: shutil.copy2(src, dst, follow_symlinks=False)
+                    if p.is_dir():
+                        shutil.copytree(p, new, copy_function=copyf, symlinks=False)
+                        edited = True
+                        shutil.rmtree(p)
+                    else:
+                        copyf(p, new)
+                        edited = True
+                        p.unlink()
+                success.append(p)
+                full_where[p] = new
+                where[p.name].add(outd)
+            except OSError as e:
+                failed.append(p)
+                _eprint(e)
+    except KeyboardInterrupt:
+        ctrlc = True
     # Inform user of failures
     failed_plus: list[str] = [str(i) for i in failed]
-    if len(failed) > 0:
+    if len(failed) > 0 and not ctrlc:
         _eprint("failed to rm:\n  " + "\n  ".join(failed_plus))
     # Log result
     success_plus: list[str] = [f"{i}  --->  {full_where[i]}" for i in success]
     fmt: Callable[[list[str]], str] = lambda l: ("\n  " + "\n  ".join(l)) if l else " None"
-    msg: str = str(datetime.now()) + "\n  " + "\n".join((
-        f"Delay: {delay}",
-        f"rf: {rf}",
-        f"Storage Directory: {base}",
-        f"Succeeded:{fmt(success_plus)}",
-        f"Failed:{fmt(failed_plus)}",
-    )).replace("\n", "\n  ") + "\n\n"
-    with log_f.open("a") as f:
-        f.write(msg)
+    msg: str = (
+        str(datetime.now())
+        + "\n  "
+        + "\n".join(
+            (
+                ("Interrupted by: SIGINT\n" if ctrlc else "") + f"Delay: {delay}",
+                f"rf: {rf}",
+                f"Storage Directory: {base}",
+                f"Succeeded:{fmt(success_plus)}",
+                f"Failed:{fmt(failed_plus)}",
+            )
+        ).replace("\n", "\n  ")
+        + "\n\n"
+    )
+    try:
+        with log_f.open("a") as f:
+            f.write(msg)
+    except OSError:
+        print(msg)
+        raise
     # Delay rm and die
-    if not success:
+    if not edited:
         shutil.rmtree(base)
     else:
         subprocess.Popen(  # pylint: disable=consider-using-with
             (sys.executable, __file__, _Secret.value, str(delay), base),
-            env = { _Secret.key: _Secret.value },
+            env={_Secret.key: _Secret.value},
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
         )
-    return not failed
+    return not failed and not ctrlc
 
 
 def delayed_rm_raw(delay: int, log: bool, r: bool, f: bool, paths: list[Path]) -> bool:
@@ -216,7 +238,9 @@ def main(prog: str, *args: str) -> bool:
     parser = argparse.ArgumentParser(prog=base)
     parser.add_argument("--version", action="version", version=f"{base} {__version__}")
     parser.add_argument("-d", "--delay", 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")
+    parser.add_argument(
+        "--log", action="store_true", help=f"Show {base}'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")

{delayed_rm-2.4.1 → delayed_rm-2.7.0}/delayed_rm.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
-Name: delayed-rm
-Version: 2.4.1
+Name: delayed_rm
+Version: 2.7.0
 Summary: Ever wish you had a few minutes to undo an rm? Now you do!
 Home-page: https://github.com/zwimer/delayed_rm
 License: GPL
+Project-URL: Homepage, https://github.com/zwimer/delayed_rm
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
@@ -11,7 +12,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 
 # delayed\_rm
-Ever wish you had a few minutes to undo an rm? Now you do! 
+Ever wish you had a few minutes to undo an rm? Now you do!
 
 # Usage
 

delayed_rm-2.7.0/pyproject.toml

@@ -0,0 +1,47 @@
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "delayed_rm"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+]
+license = {text = "GPL"}
+description = "Ever wish you had a few minutes to undo an rm? Now you do!"
+urls = {Homepage = "https://github.com/zwimer/delayed_rm"}
+requires-python = ">= 3.8"
+dynamic = ["version"]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.scripts]
+delayed_rm = "delayed_rm:cli"
+
+[tool.setuptools]
+license-files = ["LICENSE"]
+include-package-data = false
+
+[tool.setuptools.packages]
+find = {namespaces = false}
+
+[tool.setuptools.package-data]
+delayed_rm = ["py.typed"]
+
+[tool.setuptools.dynamic]
+version = {attr = "delayed_rm.__version__"}
+
+# Tools
+
+[tool.black]
+line-length = 120
+target-version = ["py38"]
+
+[tool.ruff]
+ignore=["E731","E741"]
+line-length = 120
+[tool.ruff.per-file-ignores]
+"__init__.py" = ["F401", "F403"]

delayed_rm-2.4.1/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools>=46.4.0"]
-build-backend = "setuptools.build_meta"