fix(install): rm kitPath, windows kenvPath, choice, clipboard fixes

johnlindquist · Apr 27, 2024 · 2eb4938 · 2eb4938
1 parent b1ae2ea
commit 2eb4938
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 37 deletions.
diff --git a/src/main/install.ts b/src/main/install.ts
@@ -379,29 +379,34 @@ export const downloadKenv = async () => {
 
 export const cleanKit = async () => {
   log.info(`🧹 Cleaning ${kitPath()}`);
-  const pathToClean = kitPath();
-
-  const keep = (file: string) =>
-    file === 'db' || file === 'node_modules' || file === 'assets';
-
-  // eslint-disable-next-line no-restricted-syntax
-  for await (const file of await readdir(pathToClean)) {
-    if (keep(file)) {
-      log.info(`👍 Keeping ${file}`);
-      // eslint-disable-next-line no-continue
-      continue;
-    }
-
-    const filePath = path.resolve(pathToClean, file);
-    const stat = await lstat(filePath);
-    if (stat.isDirectory()) {
-      await rm(filePath, { recursive: true, force: true });
-      log.info(`🧹 Cleaning dir ${filePath}`);
-    } else {
-      await rm(filePath);
-      log.info(`🧹 Cleaning file ${filePath}`);
-    }
-  }
+  // Remove the entire kit directory
+  await rm(kitPath(), {
+    recursive: true,
+    force: true,
+  });
+  // const pathToClean = kitPath();
+
+  // const keep = (file: string) =>
+  //   file === 'db' || file === 'node_modules' || file === 'assets';
+
+  // // eslint-disable-next-line no-restricted-syntax
+  // for await (const file of await readdir(pathToClean)) {
+  //   if (keep(file)) {
+  //     log.info(`👍 Keeping ${file}`);
+  //     // eslint-disable-next-line no-continue
+  //     continue;
+  //   }
+
+  //   const filePath = path.resolve(pathToClean, file);
+  //   const stat = await lstat(filePath);
+  //   if (stat.isDirectory()) {
+  //     await rm(filePath, { recursive: true, force: true });
+  //     log.info(`🧹 Cleaning dir ${filePath}`);
+  //   } else {
+  //     await rm(filePath);
+  //     log.info(`🧹 Cleaning file ${filePath}`);
+  //   }
+  // }
 };
 
 export const extractKitTar = async (file: string) => {

diff --git a/src/main/messages.ts b/src/main/messages.ts
@@ -32,7 +32,11 @@ import { Choice, ProcessInfo, Script } from '@johnlindquist/kit/types/core';
 
 import { ChannelMap, SendData } from '@johnlindquist/kit/types/kitapp';
 
-import { kitPath, getMainScriptPath } from '@johnlindquist/kit/core/utils';
+import {
+  kitPath,
+  kenvPath,
+  getMainScriptPath,
+} from '@johnlindquist/kit/core/utils';
 
 // const { pathExistsSync, readJson } = fsExtra;
 import { getTimestamps } from '@johnlindquist/kit/core/db';

diff --git a/src/main/prompt.ts b/src/main/prompt.ts
@@ -736,7 +736,7 @@ export class KitPrompt {
       },
     );
 
-    this.window.once('ready-to-show', () => {
+    this.window.once('ready-to-show', async () => {
       log.info(`${this.pid}: 👍 Ready to show`);
       updateTheme();
 
@@ -758,16 +758,25 @@ export class KitPrompt {
           };
 
           const { topMost, leftMost } = getTopMostAndLeftMost();
+          const kitShowInactiveTimeout = kitState.kenvEnv
+            ?.KIT_WINDOWS_PRERENDER_SHOW_INACTIVE_TIMEOUT
+            ? parseInt(
+                kitState.kenvEnv?.KIT_WINDOWS_PRERENDER_SHOW_INACTIVE_TIMEOUT,
+              )
+            : 100;
+          const kitWindowsPrerenderTimeout = kitState.kenvEnv
+            ?.KIT_WINDOWS_PRERENDER_TIMEOUT
+            ? parseInt(kitState.kenvEnv?.KIT_WINDOWS_PRERENDER_TIMEOUT)
+            : 300;
           this.window.setPosition(leftMost - 1000, topMost - 1000);
+          await new Promise((resolve) =>
+            setTimeout(resolve, kitShowInactiveTimeout),
+          );
           this.window.showInactive();
-          setTimeout(
-            () => {
-              this.window.hide();
-            },
-            kitState.kenvEnv?.KIT_WINDOWS_PRERENDER_TIMEOUT
-              ? parseInt(kitState.kenvEnv?.KIT_WINDOWS_PRERENDER_TIMEOUT)
-              : 500,
+          await new Promise((resolve) =>
+            setTimeout(resolve, kitWindowsPrerenderTimeout),
           );
+          this.window.hide();
 
           // Show window inactive super far offscreen just to force a paint, then im
         } catch (error) {
@@ -2178,9 +2187,8 @@ export class KitPrompt {
           makeKeyWindow(this.window);
           // END-REMOVE-MAC
         } else {
-          this.window?.show();
+          this.window?.showInactive();
           this.window?.focus();
-          this.window?.webContents.focus();
         }
       } catch (error) {
         log.error(error);

diff --git a/src/main/tick.ts b/src/main/tick.ts
@@ -1,5 +1,5 @@
 /* eslint-disable import/prefer-default-export */
-import clipboardEventListener from '@johnlindquist/clipboard';
+import { Clipboard } from '@johnlindquist/clipboard';
 import { Observable, Subscription } from 'rxjs';
 import { debounceTime, filter, share, switchMap } from 'rxjs/operators';
 import log from 'electron-log';
@@ -197,6 +197,7 @@ const isTransient = () => {
   });
 };
 
+let clipboardEventListener: Clipboard | null = null;
 export const startKeyboardMonitor = async () => {
   if (kitState.kenvEnv?.KIT_KEYBOARD === 'false') {
     log.info(`🔇 Keyboard monitor disabled`);
@@ -268,6 +269,7 @@ export const startClipboardMonitor = async () => {
     try {
       log.info(`Attempting to start clipboard...`);
       if (!kitState.isMac) {
+        clipboardEventListener = new Clipboard();
         clipboardEventListener.on('text', (text) => {
           try {
             log.info(`Clipboard text changed...`);
@@ -343,7 +345,7 @@ export const startClipboardMonitor = async () => {
 
     return () => {
       log.info(`🛑 Attempting to stop clipboard watcher`);
-      clipboardEventListener.close();
+      clipboardEventListener?.close();
       log.info(`🛑 Successfully stopped clipboard watcher`);
     };
   }).pipe(

diff --git a/src/renderer/src/components/button.tsx b/src/renderer/src/components/button.tsx
@@ -79,7 +79,9 @@ function ChoiceButton({
       if (flaggedValue) {
         setFlagValue('');
       } else {
-        setFlagValue(choice?.value);
+        // log.info(`Setting flag value:`, choice);
+        // TODO: On mac, a script has a ".value". On windows, it doesn't. WHY?
+        setFlagValue(choice?.value ? choice?.value : choice);
       }
     },
     [choice, setFlagValue, flaggedValue],