clonebox 0.1.17__tar.gz → 0.1.18__tar.gz

{clonebox-0.1.17/src/clonebox.egg-info → clonebox-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.17
+Version: 0.1.18
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-0.1.17 → clonebox-0.1.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clonebox"
-version = "0.1.17"
+version = "0.1.18"
 description = "Clone your workstation environment to an isolated VM with selective apps, paths and services"
 readme = "README.md"
 license = {text = "Apache-2.0"}

{clonebox-0.1.17 → clonebox-0.1.18}/src/clonebox/cli.py

@@ -80,98 +80,95 @@ def _resolve_vm_name_and_config_file(name: Optional[str]) -> tuple[str, Optional
 
 
 def _qga_ping(vm_name: str, conn_uri: str) -> bool:
-    def _qga_ping() -> bool:
-        try:
-            result = subprocess.run(
-                [
-                    "virsh",
-                    "--connect",
-                    conn_uri,
-                    "qemu-agent-command",
-                    vm_name,
-                    json.dumps({"execute": "guest-ping"}),
-                ],
-                capture_output=True,
-                text=True,
-                timeout=5,
-            )
-            return result.returncode == 0
-        except Exception:
-            return False
+    import subprocess
 
-    return _qga_ping()
+    try:
+        result = subprocess.run(
+            [
+                "virsh",
+                "--connect",
+                conn_uri,
+                "qemu-agent-command",
+                vm_name,
+                json.dumps({"execute": "guest-ping"}),
+            ],
+            capture_output=True,
+            text=True,
+            timeout=5,
+        )
+        return result.returncode == 0
+    except Exception:
+        return False
 
 
 def _qga_exec(vm_name: str, conn_uri: str, command: str, timeout: int = 10) -> Optional[str]:
-    def _qga_exec() -> Optional[str]:
-        try:
-            payload = {
-                "execute": "guest-exec",
-                "arguments": {
-                    "path": "/bin/sh",
-                    "arg": ["-c", command],
-                    "capture-output": True,
-                },
-            }
-            exec_result = subprocess.run(
+    import subprocess
+    import base64
+    import time
+
+    try:
+        payload = {
+            "execute": "guest-exec",
+            "arguments": {
+                "path": "/bin/sh",
+                "arg": ["-c", command],
+                "capture-output": True,
+            },
+        }
+        exec_result = subprocess.run(
+            [
+                "virsh",
+                "--connect",
+                conn_uri,
+                "qemu-agent-command",
+                vm_name,
+                json.dumps(payload),
+            ],
+            capture_output=True,
+            text=True,
+            timeout=timeout,
+        )
+        if exec_result.returncode != 0:
+            return None
+
+        resp = json.loads(exec_result.stdout)
+        pid = resp.get("return", {}).get("pid")
+        if not pid:
+            return None
+
+        deadline = time.time() + timeout
+        while time.time() < deadline:
+            status_payload = {"execute": "guest-exec-status", "arguments": {"pid": pid}}
+            status_result = subprocess.run(
                 [
                     "virsh",
                     "--connect",
                     conn_uri,
                     "qemu-agent-command",
                     vm_name,
-                    json.dumps(payload),
+                    json.dumps(status_payload),
                 ],
                 capture_output=True,
                 text=True,
-                timeout=timeout,
+                timeout=5,
             )
-            if exec_result.returncode != 0:
-                return None
-
-            resp = json.loads(exec_result.stdout)
-            pid = resp.get("return", {}).get("pid")
-            if not pid:
+            if status_result.returncode != 0:
                 return None
 
-            import base64
-            import time
-
-            deadline = time.time() + timeout
-            while time.time() < deadline:
-                status_payload = {"execute": "guest-exec-status", "arguments": {"pid": pid}}
-                status_result = subprocess.run(
-                    [
-                        "virsh",
-                        "--connect",
-                        conn_uri,
-                        "qemu-agent-command",
-                        vm_name,
-                        json.dumps(status_payload),
-                    ],
-                    capture_output=True,
-                    text=True,
-                    timeout=5,
-                )
-                if status_result.returncode != 0:
-                    return None
-
-                status_resp = json.loads(status_result.stdout)
-                ret = status_resp.get("return", {})
-                if not ret.get("exited", False):
-                    time.sleep(0.3)
-                    continue
-
-                out_data = ret.get("out-data")
-                if out_data:
-                    return base64.b64decode(out_data).decode().strip()
-                return ""
+            status_resp = json.loads(status_result.stdout)
+            ret = status_resp.get("return", {})
+            if not ret.get("exited", False):
+                time.sleep(0.3)
+                continue
 
-            return None
-        except Exception:
-            return None
+            out_data = ret.get("out-data")
+            if out_data:
+                return base64.b64decode(out_data).decode().strip()
+            return ""
 
-    return _qga_exec()
+        return None
+    except Exception:
+        return None
 
 
 def run_vm_diagnostics(

{clonebox-0.1.17 → clonebox-0.1.18/src/clonebox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.17
+Version: 0.1.18
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0