Fixed: Open models, logs etc users path set by user. (#85)

* Fix location path of models etc. * Add about button.
Comfy-Org · Oct 15, 2024 · 43adc17 · 43adc17
1 parent 3cdae66
commit 43adc17
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -174,7 +174,7 @@ if (!gotTheLock) {
       await handleFirstTimeSetup();
       const { userResourcesPath, appResourcesPath, pythonInstallPath, modelConfigPath, basePath } =
         await determineResourcesPaths();
-      SetupTray(mainWindow, userResourcesPath);
+      SetupTray(mainWindow, basePath);
       port = await findAvailablePort(8000, 9999).catch((err) => {
         log.error(`ERROR: Failed to find available port: ${err}`);
         throw err;
@@ -264,6 +264,19 @@ function buildMenu(): Menu {
         submenu: [{ role: 'quit' }],
       })
     );
+    menu.append(
+      new MenuItem({
+        label: 'About',
+        click: () => {
+          dialog.showMessageBox({
+            title: 'About',
+            message: `ComfyUI v${app.getVersion()}`,
+            detail: 'Created by Comfy Org\nCopyright © 2024',
+            buttons: ['OK'],
+          });
+        },
+      })
+    );
   }
 
   return menu;

diff --git a/src/tray.ts b/src/tray.ts
@@ -1,7 +1,7 @@
 import { Tray, Menu, BrowserWindow, app, shell } from 'electron';
 import path from 'path';
 
-export function SetupTray(mainView: BrowserWindow, userResourcesPath: string): Tray {
+export function SetupTray(mainView: BrowserWindow, basePath: string): Tray {
   // Set icon for the tray
   // I think there is a way to packaged the icon in so you don't need to reference resourcesPath
   const trayImage = path.join(
@@ -52,19 +52,19 @@ export function SetupTray(mainView: BrowserWindow, userResourcesPath: string): T
       submenu: [
         {
           label: 'Models',
-          click: () => shell.openPath(path.join(userResourcesPath, 'models')),
+          click: () => shell.openPath(path.join(basePath, 'models')),
         },
         {
           label: 'Outputs',
-          click: () => shell.openPath(path.join(userResourcesPath, 'output')),
+          click: () => shell.openPath(path.join(basePath, 'output')),
         },
         {
           label: 'Inputs',
-          click: () => shell.openPath(path.join(userResourcesPath, 'input')),
+          click: () => shell.openPath(path.join(basePath, 'input')),
         },
         {
           label: 'Custom Nodes',
-          click: () => shell.openPath(path.join(userResourcesPath, 'custom_nodes')),
+          click: () => shell.openPath(path.join(basePath, 'custom_nodes')),
         },
         {
           label: 'Logs',