vortex-cli 4.17.2__tar.gz → 4.17.3__tar.gz

{vortex_cli-4.17.2/vortex_cli.egg-info → vortex_cli-4.17.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.17.2
+Version: 4.17.3
 Summary: Vortex CLI
 Author-email: Jordan Amos <jordan.amos@gmail.com>
 License: MIT License

{vortex_cli-4.17.2 → vortex_cli-4.17.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortex_cli"
-version = "4.17.2"
+version = "4.17.3"
 description = "Vortex CLI"
 requires-python = ">=3.10"
 readme = { file = "README.md", content-type = "text/markdown" }

{vortex_cli-4.17.2 → vortex_cli-4.17.3}/vortex/commands/clean.py

@@ -9,12 +9,14 @@ logger = logging.getLogger("vortex")
 
 
 def clean(workspace: Workspace) -> int:
-    app_dirs = workspace.listdir(strict=False)
-    if app_dirs:
+    cloned_apps = workspace.listapps()
+    if cloned_apps:
+        host_dirs = set(workspace.path / app.host for app in cloned_apps)
+        print(host_dirs)
         with workspace.exclusive_lock():
-            for app_dir in app_dirs:
-                shutil.rmtree(app_dir)
-                logger.debug(f"Deleted directory '{app_dir}'")
+            for host_dir in host_dirs:
+                shutil.rmtree(host_dir)
+                logger.debug(f"Deleted directory '{host_dir}'")
             workspace.update_vscode_settings()
     logger.info("Workspace cleaned")
     return 0

{vortex_cli-4.17.2 → vortex_cli-4.17.3}/vortex/commands/clone.py

@@ -188,7 +188,7 @@ async def _aclone_app(
 async def _aclone_apps(
     workspace: Workspace,
     server: PuakmaServer,
-    app_ids: list[int],
+    app_ids: set[int],
     get_resources: bool,
     open_urls: bool,
 ) -> int:
@@ -233,10 +233,11 @@ def clone(
     if reclone:
         app_ids.extend(app.id for app in workspace.listapps(server))
 
+    unique_app_ids = set(app_ids)
     with (
         workspace.exclusive_lock(),
-        Spinner(f"Cloning {len(app_ids)} application(s)..."),
+        Spinner(f"Cloning {len(unique_app_ids)} application(s)..."),
     ):
         return asyncio.run(
-            _aclone_apps(workspace, server, app_ids, get_resources, open_urls)
+            _aclone_apps(workspace, server, unique_app_ids, get_resources, open_urls)
         )

{vortex_cli-4.17.2 → vortex_cli-4.17.3}/vortex/commands/export.py

@@ -21,7 +21,7 @@ def _save_bytes(data: bytes, output_path: Path) -> None:
 
 async def _aexport(
     server: PuakmaServer,
-    app_ids: list[int],
+    app_ids: set[int],
     output_dir: Path,
     timeout: int,
     include_source: bool,
@@ -86,7 +86,7 @@ async def _aexport_app_pmx(
 def export(
     workspace: Workspace,
     server: PuakmaServer,
-    app_ids: list[int],
+    app_ids: set[int],
     *,
     timeout: int,
     include_source: bool,

{vortex_cli-4.17.2 → vortex_cli-4.17.3}/vortex/main.py

@@ -193,7 +193,7 @@ def main(argv: Sequence[str] | None = None) -> int:
             return export(
                 workspace,
                 server,
-                args.app_ids,
+                set(args.app_ids),
                 timeout=args.timeout,
                 export_dir=args.export_dir,
                 include_source=args.include_source,

{vortex_cli-4.17.2 → vortex_cli-4.17.3}/vortex/models.py

@@ -368,7 +368,7 @@ class PuakmaApplication:
     @classmethod
     def from_dir(cls, path: Path) -> PuakmaApplication:
         """
-        Returns an instance of this class from the .PuakmaApplication.pickle file
+        Returns an instance of this class from the .pma file
         within the given directory.
         Raises ValueError if unsuccessful
         """

{vortex_cli-4.17.2 → vortex_cli-4.17.3}/vortex/spinner.py

@@ -5,7 +5,6 @@ import sys
 import threading
 import time
 from types import TracebackType
-from typing import Literal
 
 
 class Spinner:
@@ -53,6 +52,5 @@ class Spinner:
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None = None,
-    ) -> Literal[False]:
+    ) -> None:
         self.stop()
-        return False

{vortex_cli-4.17.2 → vortex_cli-4.17.3/vortex_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.17.2
+Version: 4.17.3
 Summary: Vortex CLI
 Author-email: Jordan Amos <jordan.amos@gmail.com>
 License: MIT License