delayed-rm 2.6.0__tar.gz → 2.8.0__tar.gz

{delayed_rm-2.6.0 → delayed_rm-2.8.0}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: delayed_rm
-Version: 2.6.0
+Version: 2.8.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
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 

{delayed_rm-2.6.0 → delayed_rm-2.8.0}/delayed_rm/delayed_rm.py

@@ -1,8 +1,7 @@
-from __future__ import annotations
+from collections.abc import Callable
 from collections import defaultdict
 from tempfile import gettempdir
 from datetime import datetime
-from typing import Callable
 from pathlib import Path
 import subprocess
 import argparse
@@ -13,7 +12,7 @@ import sys
 import os
 
 
-__version__ = "2.6.0"
+__version__ = "2.8.0"
 
 
 #
@@ -128,36 +127,43 @@ def delayed_rm(paths: list[Path], delay: int, rf: bool) -> bool:
     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]
@@ -167,7 +173,7 @@ def delayed_rm(paths: list[Path], delay: int, rf: bool) -> bool:
         + "\n  "
         + "\n".join(
             (
-                f"Delay: {delay}",
+                ("Interrupted by: SIGINT\n" if ctrlc else "") + f"Delay: {delay}",
                 f"rf: {rf}",
                 f"Storage Directory: {base}",
                 f"Succeeded:{fmt(success_plus)}",
@@ -176,10 +182,14 @@ def delayed_rm(paths: list[Path], delay: int, rf: bool) -> bool:
         ).replace("\n", "\n  ")
         + "\n\n"
     )
-    with log_f.open("a") as f:
-        f.write(msg)
+    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
@@ -188,7 +198,7 @@ def delayed_rm(paths: list[Path], delay: int, rf: bool) -> bool:
             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:

{delayed_rm-2.6.0 → delayed_rm-2.8.0}/delayed_rm.egg-info/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
-Name: delayed-rm
-Version: 2.6.0
+Name: delayed_rm
+Version: 2.8.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
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 

{delayed_rm-2.6.0 → delayed_rm-2.8.0}/delayed_rm.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-setup.cfg
 delayed_rm/__init__.py
 delayed_rm/delayed_rm.py
 delayed_rm/py.typed

{delayed_rm-2.6.0 → delayed_rm-2.8.0}/pyproject.toml

@@ -6,12 +6,12 @@ build-backend = "setuptools.build_meta"
 name = "delayed_rm"
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.10",
 ]
 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"
+requires-python = ">= 3.10"
 dynamic = ["version"]
 
 [project.readme]
@@ -38,7 +38,7 @@ version = {attr = "delayed_rm.__version__"}
 
 [tool.black]
 line-length = 120
-target-version = ["py38"]
+target-version = ["py310"]
 
 [tool.ruff]
 ignore=["E731","E741"]

delayed_rm-2.8.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

delayed_rm-2.6.0/setup.cfg

@@ -1,28 +0,0 @@
-[metadata]
-name = delayed_rm
-version = attr: delayed_rm.__version__
-url = https://github.com/zwimer/delayed_rm
-classifiers = 
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.8
-license = GPL
-license_files = LICENSE
-description = Ever wish you had a few minutes to undo an rm? Now you do!
-long_description = file: README.md
-long_description_content_type = text/markdown
-
-[options]
-python_requires = >= 3.8
-packages = find:
-
-[options.package_data]
-delayed_rm = py.typed
-
-[options.entry_points]
-console_scripts = 
-	delayed_rm = delayed_rm:cli
-
-[egg_info]
-tag_build = 
-tag_date = 0
-