🔧 Refactor import/export code slightly

Author: Schneegans

docs/changelog.md

@@ -23,6 +23,7 @@ This changelog follows the rules of [Keep a Changelog](http://keepachangelog.com
 
 ### :tada: Added
 
+- Added the possibility to import and export individual menus via JSON files. Thanks to [@Yar2000T](https://github.com/Yar2000T) for this contribution!
 - Some wlroots-specific options to handle the case where no pointer position is available. There are some timeouts which can now be configured in the settings dialog. Thanks to [@make-42](https://github.com/make-42) for this contribution!
 
 ### :wrench: Changed

src/main/app.ts

@@ -823,60 +823,61 @@ export class KandoApp {
       );
     });
 
-    // Export a single menu to a JSON file. If no filePath is provided, show a save dialog.
-    ipcMain.handle(
-      'settings-window.export-menu',
-      async (event, menuIndex: number, filePath?: string) => {
-        const settings = this.menuSettings.get();
-
-        if (menuIndex < 0 || menuIndex >= settings.menus.length) {
-          console.error('Failed to export menu: Invalid menu index.');
-          return false;
-        }
+    // Export a single menu to a JSON file. If no filePath is provided, show a save
+    // dialog.
+    ipcMain.handle('settings-window.export-menu', async (event, menuIndex: number) => {
+      const settings = this.menuSettings.get();
 
-        // We only export the root menu item (so exported files stay compact and
-        // don't include local UI flags like centered/anchored/hoverMode). This
-        // also makes future extensions easier.
-        const menu = settings.menus[menuIndex];
-        const menuData: ExportedMenuV1 = {
-          version: settings.version,
-          menu: menu.root as MenuItem,
-        };
+      if (menuIndex < 0 || menuIndex >= settings.menus.length) {
+        console.error('Failed to export menu: Invalid menu index.');
+        return false;
+      }
 
-        try {
-          let targetPath = filePath;
-          if (!targetPath) {
-            const result = await dialog.showSaveDialog(this.settingsWindow, {
-              defaultPath: `${menu.root.name}.json`,
-              filters: [{ name: 'JSON', extensions: ['json'] }],
-            });
-
-            if (result.canceled || !result.filePath) {
-              return false;
-            }
+      // We only export the root menu item (so exported files stay compact and don't
+      // include local UI flags like centered/anchored/hoverMode). This also makes future
+      // extensions easier.
+      const menu = settings.menus[menuIndex];
+      const menuData: ExportedMenuV1 = {
+        version: settings.version,
+        menu: menu.root as MenuItem,
+      };
 
-            targetPath = result.filePath;
-          }
+      try {
+        const result = await dialog.showSaveDialog(this.settingsWindow, {
+          defaultPath: `${menu.root.name}.json`,
+          filters: [{ name: 'JSON', extensions: ['json'] }],
+        });
 
-          fs.writeFileSync(targetPath, JSON.stringify(menuData, null, 2), 'utf-8');
-          return true;
-        } catch (error) {
-          console.error('Failed to export menu:', error);
-          await dialog.showMessageBox(this.settingsWindow, {
-            type: 'error',
-            title: i18next.t('settings.export-menu-error-title', 'Failed to export menu'),
-            message: 'Failed to export menu.',
-            detail: error instanceof Error ? error.message : String(error),
-          });
+        if (result.canceled || !result.filePath) {
           return false;
         }
+
+        fs.writeFileSync(result.filePath, JSON.stringify(menuData, null, 2), 'utf-8');
+        return true;
+      } catch (error) {
+        console.error('Failed to export menu:', error);
+        await dialog.showMessageBox(this.settingsWindow, {
+          type: 'error',
+          title: i18next.t('settings.export-menu-error-title', 'Failed to export menu'),
+          message: 'Failed to export menu.',
+          detail: error instanceof Error ? error.message : String(error),
+        });
+        return false;
       }
-    );
+    });
 
     // Import a menu from a JSON file
-    ipcMain.handle('settings-window.import-menu', async (event, filePath: string) => {
+    ipcMain.handle('settings-window.import-menu', async () => {
+      const result = await dialog.showOpenDialog(this.settingsWindow, {
+        filters: [{ name: 'JSON', extensions: ['json'] }],
+      });
+
+      if (result.canceled || !result.filePaths[0]) {
+        return false;
+      }
+
       try {
-        const content = fsExtra.readJsonSync(filePath, 'utf-8');
+        const content = fsExtra.readJsonSync(result.filePaths[0], 'utf-8');
 
         // Validate the exported file format first (version + root menu item)
         const exported = EXPORTED_MENU_SCHEMA_V1.parse(content, { reportInput: true });

src/settings-renderer/components/menu-list/MenuList.tsx

@@ -76,31 +76,6 @@ export default function MenuList() {
   const moveMenu = useMenuSettings((state) => state.moveMenu);
   const moveMenuItem = useMenuSettings((state) => state.moveMenuItem);
 
-  // Handle menu export
-  const handleExportMenu = async () => {
-    if (selectedMenu < 0 || selectedMenu >= menus.length) {
-      return;
-    }
-
-    // Let the main process show the save dialog and perform the export.
-    await window.settingsAPI.exportMenu(selectedMenu);
-  };
-
-  // Handle menu import
-  const handleImportMenu = async () => {
-    const result = await window.settingsAPI.openFilePicker({
-      filters: [{ name: 'JSON', extensions: ['json'] }],
-    });
-
-    if (result) {
-      const success = await window.settingsAPI.importMenu(result);
-      if (!success) {
-        // Import failed; the main process already showed a descriptive error dialog.
-        console.error('Import failed for file:', result);
-      }
-    }
-  };
-
   // This is set by the search bar in the collection details.
   const [filterTerm, setFilterTerm] = React.useState('');
 
@@ -357,15 +332,25 @@ export default function MenuList() {
             size="large"
             tooltip={i18next.t('settings.export-menu')}
             variant="floating"
-            onClick={handleExportMenu}
+            onClick={async () => {
+              if (selectedMenu < 0 || selectedMenu >= menus.length) {
+                return;
+              }
+
+              // Let the main process show the save dialog and perform the export.
+              await window.settingsAPI.exportMenu(selectedMenu);
+            }}
           />
           <Button
             isGrouped
             icon={<TbDownload />}
             size="large"
             tooltip={i18next.t('settings.import-menu')}
             variant="floating"
-            onClick={handleImportMenu}
+            onClick={async () => {
+              // Let the main process show the open dialog and perform the import.
+              await window.settingsAPI.importMenu();
+            }}
           />
           <Button
             isGrouped

src/settings-renderer/settings-window-api.ts

@@ -187,20 +187,14 @@ export const SETTINGS_WINDOW_API = {
     ipcRenderer.send('settings-window.restore-menu-settings');
   },
 
-  /**
-   * This will export a single menu to a JSON file. The native save dialog will be shown
-   * if no file path is given.
-   */
-  exportMenu: (menuIndex: number, filePath?: string): Promise<boolean> => {
-    return ipcRenderer.invoke('settings-window.export-menu', menuIndex, filePath);
+  /** This will trigger the export of the given menu to a JSON file. */
+  exportMenu: (menuIndex: number): Promise<boolean> => {
+    return ipcRenderer.invoke('settings-window.export-menu', menuIndex);
   },
 
-  /**
-   * This will import a menu from a JSON file. The handler will show an error dialog on
-   * failure.
-   */
-  importMenu: (filePath: string): Promise<boolean> => {
-    return ipcRenderer.invoke('settings-window.import-menu', filePath);
+  /** This will trigger the import of a menu from a JSON file. */
+  importMenu: (): Promise<boolean> => {
+    return ipcRenderer.invoke('settings-window.import-menu');
   },
 };