eject button (with debug console.log)

#91
jmlee337 · Feb 7, 2025 · 0e09aa1 · 0e09aa1
1 parent 9e67ac4
commit 0e09aa1
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 16 deletions.
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
@@ -146,30 +146,40 @@ export default function setupIPCs(mainWindow: BrowserWindow): void {
     return chosenReplaysDir;
   });
 
+  const maybeEject = (currentDir: string) => {
+    const key = Array.from(knownUsbs.keys()).find((usbKey) =>
+      currentDir.startsWith(usbKey),
+    );
+    if (key) {
+      return new Promise<boolean>((resolve, reject) => {
+        eject(key, (error: Error, stdout: string | Buffer) => {
+          if (error) {
+            reject(error);
+          } else {
+            console.log(`ejected ${key}`);
+            console.log(stdout);
+            resolve(true);
+          }
+        });
+      });
+    }
+    return Promise.resolve(false);
+  };
+
   ipcMain.removeHandler('deleteReplaysDir');
   ipcMain.handle('deleteReplaysDir', async () => {
     if (replayDirs.length > 0) {
       const currentDir = replayDirs[replayDirs.length - 1];
       await rm(currentDir, { recursive: true });
-      const key = Array.from(knownUsbs.keys()).find(
-        (usbKey) =>
-          currentDir === usbKey ||
-          currentDir.startsWith(`${usbKey}${path.sep}`),
-      );
-      if (key) {
-        await new Promise<void>((resolve, reject) => {
-          eject(key, (error: Error) => {
-            if (error) {
-              reject(error);
-            } else {
-              resolve();
-            }
-          });
-        });
-      }
+      await maybeEject(currentDir);
     }
   });
 
+  ipcMain.removeHandler('maybeEject');
+  ipcMain.handle('maybeEject', () =>
+    maybeEject(replayDirs[replayDirs.length - 1]),
+  );
+
   ipcMain.removeHandler('getReplaysInDir');
   ipcMain.handle('getReplaysInDir', async () => {
     if (replayDirs.length === 0) {

diff --git a/src/main/preload.ts b/src/main/preload.ts
@@ -27,6 +27,7 @@ const electronHandler = {
   chooseReplaysDir: (): Promise<string> =>
     ipcRenderer.invoke('chooseReplaysDir'),
   deleteReplaysDir: (): Promise<void> => ipcRenderer.invoke('deleteReplaysDir'),
+  maybeEject: (): Promise<boolean> => ipcRenderer.invoke('maybeEject'),
   getReplaysInDir: (): Promise<{
     replays: Replay[];
     invalidReplays: InvalidReplay[];

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -28,6 +28,7 @@ import {
   DeleteForever,
   DeleteForeverOutlined,
   Edit,
+  Eject,
   FolderOpen,
   HourglassTop,
   Refresh,
@@ -1450,6 +1451,17 @@ function Hello() {
                 value={dir || 'Set replays folder...'}
                 style={{ flexGrow: 1 }}
               />
+              {dir && (
+                <Tooltip arrow title="Eject (if USB)">
+                  <IconButton
+                    onClick={async () => {
+                      await window.electron.maybeEject();
+                    }}
+                  >
+                    <Eject />
+                  </IconButton>
+                </Tooltip>
+              )}
               {dir &&
                 dirExists &&
                 !gettingReplays &&