Refactor: Renderer asks main for default install location. (#206)

Comfy-Org · Nov 8, 2024 · 834aa5c · 834aa5c
1 parent ed73db3
commit 834aa5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -390,11 +390,8 @@ export const createWindow = async (): Promise<BrowserWindow> => {
   });
 
   log.info('Loading renderer into main window');
-  mainWindow.webContents.on('did-finish-load', () => {
-    if (mainWindow) {
-      mainWindow.webContents.send(IPC_CHANNELS.DEFAULT_INSTALL_LOCATION, app.getPath('documents'));
-    }
-  });
+
+  ipcMain.handle(IPC_CHANNELS.DEFAULT_INSTALL_LOCATION, () => app.getPath('documents'));
 
   await loadRendererIntoMainWindow();
   log.info('Renderer loaded into main window');

diff --git a/src/preload.ts b/src/preload.ts
@@ -56,11 +56,8 @@ const electronAPI = {
   onFirstTimeSetupComplete: (callback: () => void) => {
     ipcRenderer.on(IPC_CHANNELS.FIRST_TIME_SETUP_COMPLETE, () => callback());
   },
-  onDefaultInstallLocation: (callback: (location: string) => void) => {
-    ipcRenderer.on(IPC_CHANNELS.DEFAULT_INSTALL_LOCATION, (_event, value) => {
-      console.log(`Received ${IPC_CHANNELS.DEFAULT_INSTALL_LOCATION} event`, value);
-      callback(value);
-    });
+  getDefaultInstallLocation: (): Promise<string> => {
+    return ipcRenderer.invoke(IPC_CHANNELS.DEFAULT_INSTALL_LOCATION);
   },
   /**
    * Various paths that are useful to the renderer.

diff --git a/src/renderer/index.tsx b/src/renderer/index.tsx
@@ -62,7 +62,7 @@ const Home: React.FC = () => {
   }, [updateProgress, addLogMessage]);
 
   useEffect(() => {
-    electronAPI.onDefaultInstallLocation((location: string) => {
+    electronAPI.getDefaultInstallLocation().then((location: string) => {
       setDefaultInstallLocation(location);
     });
   }, []);