From 2a1bab6365f4f9a0d492fa43183bc775f725aed6 Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Fri, 8 Mar 2024 11:35:55 +0000
Subject: [PATCH] Added open folder link to file menu

---
 index.html |  6 +++++-
 js/ui.js   | 17 ++++++++++++-----
 main.js    |  4 ++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index cd3451f9..b31dc980 100644
--- a/index.html
+++ b/index.html
@@ -549,10 +549,14 @@ <h5>Saved Records</h5>
                             File
                         </a>
                         <ul class="dropdown-menu">
-                            <li><a id="open" class="dropdown-item" href="#">
+                            <li><a id="open-file" class="dropdown-item" href="#">
                                 <span class="material-symbols-outlined">file_open</span> Open Audio
                                 File(s) <span class="shortcut float-end">Ctrl+O</span></a>
                             </li>
+                            <li><a id="open-folder" class="dropdown-item" href="#">
+                                <span class="material-symbols-outlined">folder_open</span> Open 
+                                Folder(s)</a>
+                            </li>
                             <div class="dropdown-divider"></div>
                             <li><a class="dropdown-item disabled" id="saveCSV" href="#">
                                 <span class="material-symbols-outlined">ios_share</span> Export Results
diff --git a/js/ui.js b/js/ui.js
index 493f1500..88f7a318 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -453,9 +453,15 @@ function zoomSpec(direction) {
     }
 }
 
-async function showOpenDialog() {
-    const files = await window.electron.openDialog('showOpenDialog', {type: 'audio'});
-    if (!files.canceled) await onOpenFiles({ filePaths: files.filePaths });
+async function showOpenDialog(fileOrFolder) {
+    const files = await window.electron.openDialog('showOpenDialog', {type: 'audio', fileOrFolder: fileOrFolder});
+    if (!files.canceled) {
+        if (fileOrFolder === 'openFiles'){
+            await onOpenFiles({ filePaths: files.filePaths });
+        } else {
+            filterValidFiles({ filePaths: files.filePaths })
+        }
+    }
 }
 
 // function powerSave(on) {
@@ -2427,7 +2433,7 @@ function onChartData(args) {
             if ( e.ctrlKey || e.metaKey) showGoToPosition();
         },
         KeyO: async function (e) {
-            if ( e.ctrlKey || e.metaKey) await showOpenDialog();
+            if ( e.ctrlKey || e.metaKey) await showOpenDialog('openFile');
         },
         KeyP: function () {
             (typeof region !== 'undefined') ? region.play() : console.log('Region undefined')
@@ -4057,7 +4063,8 @@ DOM.gain.addEventListener('input', () => {
         const target = e.target.closest('[id]')?.id;
         switch (target)
         {
-            case 'open': { showOpenDialog(); break }
+            case 'open-file': { showOpenDialog('openFile'); break }
+            case 'open-folder': { showOpenDialog('openDirectory'); break }
             case 'saveLabels': { showSaveDialog(); break }
             case 'saveCSV': { export2CSV(); break }
             case 'export-audio': { exportAudio(); break }
diff --git a/main.js b/main.js
index 10aae200..79ad1c6d 100644
--- a/main.js
+++ b/main.js
@@ -379,14 +379,14 @@ app.whenReady().then(async () => {
     });
     
     ipcMain.handle('openFiles', async (_event, _method, config) => {
-        const {type} = config;
+        const {type, fileOrFolder} = config;
         let options;
         if (type === 'audio') {
              options = {
                 filters: [
                     { name: 'Audio Files', extensions: ['mp3', 'wav', 'ogg', 'aac', 'flac', 'm4a', 'mpga', 'mpeg', 'mp4', 'opus'] } 
                 ],
-                properties: ['openFile', 'multiSelections'] 
+                properties: [fileOrFolder, 'multiSelections'] 
             }
         } else {
             options = {