fix: invalid logics when execute command based on not installed workspace (#82)

* fix: invalid logics when execute command based on not installed workspace

#81

* remove useless startup scan code

Author: ltdrdata

comfy_cli/cmdline.py

@@ -122,11 +122,13 @@ def entry(
         )
         print(ctx.get_help())
         ctx.exit()
-    start_time = time.time()
-    workspace_manager.scan_dir()
-    end_time = time.time()
 
-    logging.info(f"scan_dir took {end_time - start_time:.2f} seconds to run")
+    # TODO: Move this to proper place
+    # start_time = time.time()
+    # workspace_manager.scan_dir()
+    # end_time = time.time()
+    #
+    # logging.info(f"scan_dir took {end_time - start_time:.2f} seconds to run")
 
 
 gpu_exclusivity_callback = mutually_exclusive_group_options()
@@ -602,6 +604,7 @@ def launch(
 ):
     check_for_updates()
     resolved_workspace = workspace_manager.workspace_path
+
     if not resolved_workspace:
         print(
             "\nComfyUI is not available.\nTo install ComfyUI, you can run:\n\n\tcomfy install\n\n",
@@ -642,12 +645,18 @@ def set_default(
     comfy_path = os.path.abspath(os.path.expanduser(workspace_path))
 
     if not os.path.exists(comfy_path):
-        print(f"Path not found: {comfy_path}.")
+        print(
+            f"\nPath not found: {comfy_path}.\n",
+            file=sys.stderr,
+        )
         raise typer.Exit(code=1)
 
     is_comfy_repo, comfy_repo = check_comfy_repo(comfy_path)
     if not is_comfy_repo:
-        print(f"Specified path is not a ComfyUI path: {comfy_path}.")
+        print(
+            f"\nSpecified path is not a ComfyUI path: {comfy_path}.\n",
+            file=sys.stderr,
+        )
         raise typer.Exit(code=1)
 
     comfy_path = comfy_repo.working_dir

comfy_cli/command/custom_nodes/command.py

@@ -35,15 +35,20 @@ def execute_cm_cli(args, channel=None, mode=None):
 
     workspace_path = workspace_manager.workspace_path
 
-    if not os.path.exists(workspace_path):
-        print(f"\nComfyUI not found: {workspace_path}\n", file=sys.stderr)
+    if not workspace_path:
+        print(
+            f"\n[bold red]ComfyUI path is not resolved.[/bold red]\n", file=sys.stderr
+        )
         raise typer.Exit(code=1)
 
     cm_cli_path = os.path.join(
         workspace_path, "custom_nodes", "ComfyUI-Manager", "cm-cli.py"
     )
     if not os.path.exists(cm_cli_path):
-        print(f"\nComfyUI-Manager not found: {cm_cli_path}\n", file=sys.stderr)
+        print(
+            f"\n[bold red]ComfyUI-Manager not found: {cm_cli_path}[/bold red]\n",
+            file=sys.stderr,
+        )
         raise typer.Exit(code=1)
 
     cmd = [sys.executable, cm_cli_path] + args
@@ -66,7 +71,7 @@ def execute_cm_cli(args, channel=None, mode=None):
         subprocess.run(cmd, env=new_env, check=True)
     except subprocess.CalledProcessError as e:
         if e.returncode == 1:
-            print(f"Execution error: {cmd}", file=sys.stderr)
+            print(f"\n[bold red]Execution error: {cmd}[/bold red]\n", file=sys.stderr)
         elif e.returncode == 2:
             pass
         else:

comfy_cli/command/install.py

@@ -189,6 +189,7 @@ def execute(
     )
 
     WorkspaceManager().set_recent_workspace(repo_dir)
+    workspace_manager.setup_workspace_manager(specified_workspace=repo_dir)
 
     print("")
 

comfy_cli/workspace_manager.py

@@ -275,20 +275,20 @@ def get_workspace_path(self) -> Tuple[str, WorkspaceType]:
             constants.CONFIG_KEY_DEFAULT_WORKSPACE
         )
 
-        if default_workspace and check_comfy_repo(default_workspace):
+        if default_workspace and check_comfy_repo(default_workspace)[0]:
             return default_workspace, WorkspaceType.DEFAULT
 
         # Fallback to the most recent workspace if it exists
         if self.use_recent is None:
             recent_workspace = self.config_manager.get(
                 constants.CONFIG_KEY_RECENT_WORKSPACE
             )
-            if recent_workspace and check_comfy_repo(recent_workspace):
+            if recent_workspace and check_comfy_repo(recent_workspace)[0]:
                 return recent_workspace, WorkspaceType.RECENT
 
         # Check for comfy-cli default workspace
         default_workspace = utils.get_not_user_set_default_workspace()
-        if check_comfy_repo(default_workspace):
+        if check_comfy_repo(default_workspace)[0]:
             return default_workspace, WorkspaceType.DEFAULT
 
         return None, WorkspaceType.NOT_FOUND
@@ -314,6 +314,9 @@ def is_comfyui_manager_installed(self):
         return os.path.exists(manager_git_path)
 
     def scan_dir(self):
+        if not self.workspace_path:
+            return []
+
         logging.info(f"Scanning directory: {self.workspace_path}")
         model_files = []
         for root, _dirs, files in os.walk(self.workspace_path):