unity-hub-cli 0.2.0 → 0.4.0

package/dist/index.js

@@ -6,22 +6,26 @@ import { render } from "ink";
 
 // src/application/usecases.ts
 var ListProjectsUseCase = class {
-  constructor(unityHubProjectsReader, gitRepositoryInfoReader, unityProjectOptionsReader) {
+  constructor(unityHubProjectsReader, gitRepositoryInfoReader, unityProjectOptionsReader, lockReader) {
     this.unityHubProjectsReader = unityHubProjectsReader;
     this.gitRepositoryInfoReader = gitRepositoryInfoReader;
     this.unityProjectOptionsReader = unityProjectOptionsReader;
+    this.lockReader = lockReader;
   }
   async execute() {
     const projects = await this.unityHubProjectsReader.listProjects();
-    const repositoryInfoResults = await Promise.allSettled(
-      projects.map((project) => this.gitRepositoryInfoReader.readRepositoryInfo(project.path))
-    );
+    const [repositoryInfoResults, lockResults] = await Promise.all([
+      Promise.allSettled(
+        projects.map((project) => this.gitRepositoryInfoReader.readRepositoryInfo(project.path))
+      ),
+      Promise.allSettled(projects.map((project) => this.lockReader.isLocked(project.path)))
+    ]);
     return projects.map((project, index) => {
       const repositoryResult = repositoryInfoResults[index];
-      if (repositoryResult.status === "fulfilled") {
-        return { project, repository: repositoryResult.value ?? void 0 };
-      }
-      return { project };
+      const lockResult = lockResults[index];
+      const repository = repositoryResult.status === "fulfilled" ? repositoryResult.value ?? void 0 : void 0;
+      const isLocked = lockResult.status === "fulfilled" ? Boolean(lockResult.value) : false;
+      return { project, repository, isLocked };
     });
   }
 };
@@ -441,6 +445,12 @@ var UnityLockChecker = class {
     return "allow";
   }
 };
+var UnityLockStatusReader = class {
+  async isLocked(projectPath) {
+    const lockfilePath = join3(projectPath, "Temp", "UnityLockfile");
+    return await pathExists(lockfilePath);
+  }
+};
 
 // src/presentation/App.tsx
 import clipboard from "clipboardy";
@@ -530,10 +540,12 @@ var formatUpdatedText = (lastModified) => {
 var homeDirectory = process.env.HOME ?? "";
 var homePrefix = homeDirectory ? `${homeDirectory}/` : "";
 var minimumVisibleProjectCount = 4;
-var defaultHintMessage = "Move with arrows or j/k \xB7 Launch & exit with o \xB7 Copy cd path with c \xB7 Exit with Ctrl+C twice";
+var defaultHintMessage = "Move with arrows or j/k \xB7 Launch with o \xB7 Copy cd path with c \xB7 Exit with Ctrl+C";
 var PROJECT_COLOR = "#abd8e7";
 var BRANCH_COLOR = "#e3839c";
 var PATH_COLOR = "#719bd8";
+var LOCK_COLOR = "yellow";
+var LOCK_LABEL = "[running]";
 var shortenHomePath = (targetPath) => {
   if (!homeDirectory) {
     return targetPath;
@@ -562,7 +574,6 @@ var App = ({
   const [visibleCount, setVisibleCount] = useState(minimumVisibleProjectCount);
   const [index, setIndex] = useState(0);
   const [hint, setHint] = useState(defaultHintMessage);
-  const [pendingExit, setPendingExit] = useState(false);
   const [windowStart, setWindowStart] = useState(0);
   const linesPerProject = (showBranch ? 1 : 0) + (showPath ? 1 : 0) + 2;
   const sortedProjects = useMemo(() => {
@@ -596,22 +607,13 @@ var App = ({
   }, [projects, useGitRootName]);
   useEffect(() => {
     const handleSigint = () => {
-      if (!pendingExit) {
-        setPendingExit(true);
-        setHint("Press Ctrl+C again to exit");
-        setTimeout(() => {
-          setPendingExit(false);
-          setHint(defaultHintMessage);
-        }, 2e3);
-        return;
-      }
       exit();
     };
     process.on("SIGINT", handleSigint);
     return () => {
       process.off("SIGINT", handleSigint);
     };
-  }, [exit, pendingExit]);
+  }, [exit]);
   useEffect(() => {
     const updateVisibleCount = () => {
       if (!stdout || typeof stdout.columns !== "number" || typeof stdout.rows !== "number") {
@@ -723,7 +725,7 @@ var App = ({
       setHint(defaultHintMessage);
     }, 2e3);
   }, [index, sortedProjects]);
-  const launchSelectedAndExit = useCallback(async () => {
+  const launchSelected = useCallback(async () => {
     const projectView = sortedProjects[index];
     if (!projectView) {
       setHint("No project to launch");
@@ -746,8 +748,10 @@ var App = ({
     }
     try {
       await onLaunch(project);
-      stdout?.write("\x1B[2J\x1B[H");
-      exit();
+      setHint(`Launched: ${project.title}`);
+      setTimeout(() => {
+        setHint(defaultHintMessage);
+      }, 3e3);
     } catch (error) {
       if (error instanceof LaunchCancelledError) {
         setHint("Launch cancelled");
@@ -762,7 +766,7 @@ var App = ({
         setHint(defaultHintMessage);
       }, 3e3);
     }
-  }, [exit, index, onLaunch, sortedProjects, stdout]);
+  }, [index, onLaunch, sortedProjects]);
   useInput((input, key) => {
     if (input === "j" || key.downArrow) {
       move(1);
@@ -771,7 +775,7 @@ var App = ({
       move(-1);
     }
     if (input === "o") {
-      void launchSelectedAndExit();
+      void launchSelected();
     }
     if (input === "c") {
       copyProjectPath();
@@ -820,7 +824,7 @@ var App = ({
     });
   }, [linesPerProject, projects.length, startIndex, visibleProjects]);
   const rows = useMemo(() => {
-    return visibleProjects.map(({ project, repository }, offset) => {
+    return visibleProjects.map(({ project, repository, isLocked }, offset) => {
       const rowIndex = startIndex + offset;
       const isSelected = rowIndex === index;
       const arrow = isSelected ? ">" : " ";
@@ -846,7 +850,8 @@ var App = ({
               " ",
               versionLabel
             ] }),
-            updatedText ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: `  ${updatedText}` }) : null
+            updatedText ? /* @__PURE__ */ jsx(Text, { color: isSelected ? "green" : void 0, children: `  ${updatedText}` }) : null,
+            isLocked ? /* @__PURE__ */ jsx(Text, { color: LOCK_COLOR, children: `  ${LOCK_LABEL}` }) : null
           ] }),
           showBranch ? /* @__PURE__ */ jsxs(Text, { color: isSelected ? "green" : BRANCH_COLOR, children: [
             "  ",
@@ -878,10 +883,12 @@ import { jsx as jsx2 } from "react/jsx-runtime";
 var bootstrap = async () => {
   const unityHubReader = new UnityHubProjectsReader();
   const gitRepositoryInfoReader = new GitRepositoryInfoReader();
+  const lockStatusReader = new UnityLockStatusReader();
   const listProjectsUseCase = new ListProjectsUseCase(
     unityHubReader,
     gitRepositoryInfoReader,
-    unityHubReader
+    unityHubReader,
+    lockStatusReader
   );
   const editorPathResolver = new MacEditorPathResolver();
   const processLauncher = new NodeProcessLauncher();
@@ -898,7 +905,7 @@ var bootstrap = async () => {
   const showPath = !process2.argv.includes("--hide-path");
   try {
     const projects = await listProjectsUseCase.execute();
-    render(
+    const { waitUntilExit } = render(
       /* @__PURE__ */ jsx2(
         App,
         {
@@ -910,6 +917,8 @@ var bootstrap = async () => {
         }
       )
     );
+    await waitUntilExit();
+    process2.stdout.write("\x1B[2J\x1B[3J\x1B[H");
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.error(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-hub-cli",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "A CLI tool that reads Unity Hub's projects and launches Unity Editor with an interactive TUI",
   "main": "dist/index.js",
   "scripts": {