open file command

app/src/electron.js

@@ -56,12 +56,7 @@ function buildMenu() {
       label: 'File',
       submenu: [
         commandItem('new.connection'),
-        {
+        commandItem('file.open'),
-          label: 'Open file',
-          click() {
-            mainWindow.webContents.executeJavaScript(`dbgate_openFile()`);
-          },
-        },
         commandItem('group.save'),
         commandItem('group.saveAs'),
         { type: 'separator' },
@@ -70,13 +65,7 @@ function buildMenu() {
     },
     {
       label: 'Window',
-      submenu: [
+      submenu: [commandItem('new.query'), { type: 'separator' }, commandItem('tabs.closeAll'), { role: 'minimize' }],
-        commandItem('new.query'),
-        { type: 'separator' },
-       
-        commandItem('tabs.closeAll'),
-        { role: 'minimize' },
-      ],
     },
 
     // {

packages/web/src/commands/stdCommands.ts

@@ -8,6 +8,10 @@ import { showModal } from '../modals/modalTools';
 import newQuery from '../query/newQuery';
 import saveTabFile from '../utility/saveTabFile';
 import openNewTab from '../utility/openNewTab';
+import getElectron from '../utility/getElectron';
+import { openElectronFile } from '../utility/openElectronFile';
+
+const electron = getElectron();
 
 function themeCommand(theme: ThemeDefinition) {
   return {
@@ -136,6 +140,16 @@ registerCommand({
   group: 'saveAs',
 });
 
+if (electron) {
+  registerCommand({
+    id: 'file.open',
+    category: 'File',
+    name: 'Open',
+    keyText: 'Ctrl+O',
+    onClick: openElectronFile,
+  });
+}
+
 export function registerFileCommands({
   idPrefix,
   category,

packages/web/src/utility/openElectronFile.ts

@@ -1,6 +1,9 @@
 import { showModal } from '../modals/modalTools';
+import { get } from 'svelte/store';
 import newQuery from '../query/newQuery';
 import ImportExportModal from '../modals/ImportExportModal.svelte';
+import getElectron from './getElectron';
+import { extensions } from '../stores';
 
 export function canOpenByElectron(file, extensions) {
   if (!file) return false;
@@ -45,3 +48,27 @@ export function openElectronFileCore(filePath, extensions) {
     }
   }
 }
+
+function getFileFormatFilters(extensions) {
+  return extensions.fileFormats.filter(x => x.readerFunc).map(x => ({ name: x.name, extensions: [x.extension] }));
+}
+
+function getFileFormatExtensions(extensions) {
+  return extensions.fileFormats.filter(x => x.readerFunc).map(x => x.extension);
+}
+
+export function openElectronFile() {
+  const electron = getElectron();
+  const ext = get(extensions);
+  const filePaths = electron.remote.dialog.showOpenDialogSync(electron.remote.getCurrentWindow(), {
+    filters: [
+      { name: `All supported files`, extensions: ['sql', ...getFileFormatExtensions(ext)] },
+      { name: `SQL files`, extensions: ['sql'] },
+      ...getFileFormatFilters(ext),
+    ],
+  });
+  const filePath = filePaths && filePaths[0];
+  if (canOpenByElectron(filePath, ext)) {
+    openElectronFileCore(filePath, ext);
+  }
+}