rclone-api 1.4.15__py2.py3-none-any.whl → 1.4.19__py2.py3-none-any.whl

rclone_api/util.py

@@ -5,10 +5,13 @@ import shutil
 import signal
 import subprocess
 import warnings
+import weakref
 from pathlib import Path
 from threading import Lock
 from typing import Any
 
+import psutil
+
 from rclone_api.config import Config
 from rclone_api.dir import Dir
 from rclone_api.remote import Remote
@@ -167,51 +170,109 @@ def rclone_execute(
     tmpfile: Path | None = None
     verbose = get_verbose(verbose)
 
-    # Handle the Path case for capture
-    output_file = None
+    # Handle the Path case for capture.
+    output_file: Path | None = None
     if isinstance(capture, Path):
         output_file = capture
-        capture = False  # Don't capture to memory when redirecting to file
+        capture = False  # When redirecting to file, don't capture to memory.
     else:
         capture = capture if isinstance(capture, bool) else True
 
-    assert verbose is not None
-
     try:
+        # Create a temporary config file if needed.
         if isinstance(rclone_conf, Config):
             tmpfile = make_temp_config_file()
             tmpfile.write_text(rclone_conf.text, encoding="utf-8")
             rclone_conf = tmpfile
-        cmd = (
+
+        # Build the command line.
+        full_cmd = (
             [str(rclone_exe.resolve())] + ["--config", str(rclone_conf.resolve())] + cmd
         )
         if verbose:
-            cmd_str = subprocess.list2cmdline(cmd)
+            cmd_str = subprocess.list2cmdline(full_cmd)
             print(f"\nRunning: {cmd_str}")
 
-        # If output_file is set, redirect output to that file
+        # Prepare subprocess parameters.
+        proc_kwargs: dict[str, Any] = {
+            "encoding": "utf-8",
+            "shell": False,
+            "stderr": subprocess.PIPE,
+        }
+        file_handle = None
         if output_file:
-            with open(output_file, "w", encoding="utf-8") as f:
-                cp = subprocess.run(
-                    cmd,
-                    stdout=f,
-                    stderr=subprocess.PIPE,
-                    encoding="utf-8",
-                    check=False,
-                    shell=False,
-                )
+            # Open the file for writing.
+            file_handle = open(output_file, "w", encoding="utf-8")
+            proc_kwargs["stdout"] = file_handle
         else:
-            cp = subprocess.run(
-                cmd, capture_output=capture, encoding="utf-8", check=False, shell=False
-            )
+            proc_kwargs["stdout"] = subprocess.PIPE if capture else None
+
+        # Start the process.
+        process = subprocess.Popen(full_cmd, **proc_kwargs)
+
+        # Register an atexit callback that uses psutil to kill the process tree.
+        proc_ref = weakref.ref(process)
+
+        def cleanup():
+            proc = proc_ref()
+            if proc is None:
+                return
+            try:
+                parent = psutil.Process(proc.pid)
+            except psutil.NoSuchProcess:
+                return
+            # Terminate all child processes first.
+            children = parent.children(recursive=True)
+            if children:
+                print(f"Terminating {len(children)} child process(es)...")
+                for child in children:
+                    try:
+                        child.terminate()
+                    except Exception as e:
+                        print(f"Error terminating child {child.pid}: {e}")
+                psutil.wait_procs(children, timeout=2)
+                for child in children:
+                    if child.is_running():
+                        try:
+                            child.kill()
+                        except Exception as e:
+                            print(f"Error killing child {child.pid}: {e}")
+            # Now terminate the parent process.
+            if parent.is_running():
+                try:
+                    parent.terminate()
+                    parent.wait(timeout=3)
+                except (psutil.TimeoutExpired, Exception):
+                    try:
+                        parent.kill()
+                    except Exception as e:
+                        print(f"Error killing process {parent.pid}: {e}")
+
+        atexit.register(cleanup)
+
+        # Wait for the process to complete.
+        out, err = process.communicate()
+        # Close the file handle if used.
+        if file_handle:
+            file_handle.close()
+
+        cp: subprocess.CompletedProcess = subprocess.CompletedProcess(
+            args=full_cmd,
+            returncode=process.returncode,
+            stdout=out,
+            stderr=err,
+        )
+
+        # Warn or raise if return code is non-zero.
         if cp.returncode != 0:
-            cmd_str = subprocess.list2cmdline(cmd)
+            cmd_str = subprocess.list2cmdline(full_cmd)
             warnings.warn(
-                f"Error running: {cmd_str}, returncode: {cp.returncode}\n{cp.stdout}\n{cp.stderr}"
+                f"Error running: {cmd_str}, returncode: {cp.returncode}\n"
+                f"{cp.stdout}\n{cp.stderr}"
             )
             if check:
                 raise subprocess.CalledProcessError(
-                    cp.returncode, cmd, cp.stdout, cp.stderr
+                    cp.returncode, full_cmd, cp.stdout, cp.stderr
                 )
         return cp
     finally:

{rclone_api-1.4.15.dist-info → rclone_api-1.4.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.4.15
+Version: 1.4.19
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License

{rclone_api-1.4.15.dist-info → rclone_api-1.4.19.dist-info}/RECORD

@@ -17,23 +17,23 @@ rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,803
 rclone_api/http_server.py,sha256=3fPBV6l50erTe32DyeJBNmsDrn5KuujsbmEAbx13T-c,8720
 rclone_api/log.py,sha256=VZHM7pNSXip2ZLBKMP7M1u-rp_F7zoafFDuR8CPUoKI,1271
 rclone_api/mount.py,sha256=TE_VIBMW7J1UkF_6HRCt8oi_jGdMov4S51bm2OgxFAM,10045
-rclone_api/process.py,sha256=I7B4arAIbFcTBsek27cZ0t-l5YRWVHJJPji7G6ZLGjQ,4989
+rclone_api/process.py,sha256=tGooS5NLdPuqHh7hCH8SfK44A6LGftPQCPQUNgSo0a0,5714
 rclone_api/rclone_impl.py,sha256=xTTriz6-zn_aSrkY8B7wzT-zRXax7Og7ns6xu6-7O6g,48769
 rclone_api/remote.py,sha256=mTgMTQTwxUmbLjTpr-AGTId2ycXKI9mLX5L7PPpDIoc,520
 rclone_api/rpath.py,sha256=Y1JjQWcie39EgQrq-UtbfDz5yDLCwwfu27W7AQXllSE,2860
 rclone_api/scan_missing_folders.py,sha256=-8NCwpCaHeHrX-IepCoAEsX1rl8S-GOCxcIhTr_w3gA,4747
 rclone_api/types.py,sha256=HkpEZgZWhr5Gb04iHq5NxMRXxieWoN-PKmOfJFrg5Qg,12155
-rclone_api/util.py,sha256=9w_m6W62l_X42Jw5q8p_p30h-QoxAqufvnCLI4PTMOE,7056
+rclone_api/util.py,sha256=yY72YKpmpT_ZM7AleVtPpl0YZZYQPTwTdqKn9qPwm8Y,9290
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/analyze.py,sha256=RHbvk1G5ZUc3qLqlm1AZEyQzd_W_ZjcbCNDvW4YpTKQ,1252
 rclone_api/cmd/copy_large_s3.py,sha256=B17GliDQyAauNglJCpsey0d3eArT2DAcT9g684TMQk8,3514
-rclone_api/cmd/copy_large_s3_finish.py,sha256=6fP95UU4ueBkGmkhX4YDu1ze0HIJlgYhCGF5z9IFc3k,5015
+rclone_api/cmd/copy_large_s3_finish.py,sha256=Q_8uvC2J3V_jGQj8ualMlejWEPpkFn267bUKLC3Sp2M,2050
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
 rclone_api/cmd/save_to_db.py,sha256=ylvnhg_yzexM-m6Zr7XDiswvoDVSl56ELuFAdb9gqBY,1957
 rclone_api/db/__init__.py,sha256=OSRUdnSWUlDTOHmjdjVmxYTUNpTbtaJ5Ll9sl-PfZg0,40
 rclone_api/db/db.py,sha256=YRnYrCaXHwytQt07uEZ_mMpvPHo9-0IWcOb95fVOOfs,10086
 rclone_api/db/models.py,sha256=v7qaXUehvsDvU51uk69JI23fSIs9JFGcOa-Tv1c_wVs,1600
-rclone_api/detail/copy_file_parts.py,sha256=dpqZ0d7l195dZg6Vob2Ty43Uah1v0ozQu5kMtblGqYc,16175
+rclone_api/detail/copy_file_parts.py,sha256=1h-5JJmZdB0_TuVcuYMIClHqAgCXUI4eLyZHbdRiCHg,16280
 rclone_api/detail/walk.py,sha256=-54NVE8EJcCstwDoaC_UtHm73R2HrZwVwQmsnv55xNU,3369
 rclone_api/experimental/flags.py,sha256=qCVD--fSTmzlk9hloRLr0q9elzAOFzPsvVpKM3aB1Mk,2739
 rclone_api/experimental/flags_base.py,sha256=ajU_czkTcAxXYU-SlmiCfHY7aCQGHvpCLqJ-Z8uZLk0,2102
@@ -41,16 +41,17 @@ rclone_api/s3/api.py,sha256=owoQ1H-R0hXcUozxC6sl53D7NmMOewHk2pUxK-ye8ms,4061
 rclone_api/s3/basic_ops.py,sha256=hK3366xhVEzEcjz9Gk_8lFx6MRceAk72cax6mUrr6ko,2104
 rclone_api/s3/chunk_task.py,sha256=waEYe-iYQ1_BR3NCS4BrzVrK9UANvH1EcbXx2I6Z_NM,6839
 rclone_api/s3/create.py,sha256=_Q-faQ4Zl8XKTB28gireRxVXWP-YNxoAK4bligxDtiI,3998
-rclone_api/s3/s3_multipart_uploader_by_copy.py,sha256=JjMSG9XHiBlKnihPKw43SBYsh-NBqg5FZ4rnGU7j48s,8703
+rclone_api/s3/merge_state.py,sha256=ziTB9CYV-OWaky5C1fOT9hifSY2zgUrk5HmX1Xeu2UA,4978
+rclone_api/s3/s3_multipart_uploader_by_copy.py,sha256=iuxnRaRDHvIMCu-9YDZzirRMc1R4gZgjigkM5u_MFJg,17188
 rclone_api/s3/types.py,sha256=cYI5MbXRNdT-ps5kGIRQaYrseHyx_ozT4AcwBABTKwk,1616
 rclone_api/s3/upload_file_multipart.py,sha256=V7syKjFyVIe4U9Ahl5XgqVTzt9akiew3MFjGmufLo2w,12503
 rclone_api/s3/multipart/file_info.py,sha256=8v_07_eADo0K-Nsv7F0Ac1wcv3lkIsrR3MaRCmkYLTQ,105
-rclone_api/s3/multipart/finished_piece.py,sha256=9nMWnVZ8S99wi2VFQsm1h1ZHqmebkhMGgd2s56wNj9w,1331
+rclone_api/s3/multipart/finished_piece.py,sha256=LtlX_mm6_hsADR8FxgfC2_pcO5Wou_20-jE34IcRXew,1633
 rclone_api/s3/multipart/upload_info.py,sha256=d6_OfzFR_vtDzCEegFfzCfWi2kUBUV4aXZzqAEVp1c4,1874
 rclone_api/s3/multipart/upload_state.py,sha256=f-Aq2NqtAaMUMhYitlICSNIxCKurWAl2gDEUVizLIqw,6019
-rclone_api-1.4.15.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.4.15.dist-info/METADATA,sha256=yC0hOJ09OMTVwf98k6NEfy7-gmlwu4IqWmWdnfUP67Q,4628
-rclone_api-1.4.15.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.4.15.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
-rclone_api-1.4.15.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.4.15.dist-info/RECORD,,
+rclone_api-1.4.19.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.4.19.dist-info/METADATA,sha256=RpqVhvMVSL_isjprjoRJJWMStau5WxyiiyO1OkHBydo,4628
+rclone_api-1.4.19.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.4.19.dist-info/entry_points.txt,sha256=fJteOlYVwgX3UbNuL9jJ0zUTuX2O79JFAeNgK7Sw7EQ,255
+rclone_api-1.4.19.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.4.19.dist-info/RECORD,,