From f621c92d08f1e460cb040a6c140a7f8859b93001 Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Tue, 15 Oct 2024 02:11:39 +0100
Subject: [PATCH 01/15] Ditched daylight banner Added ability to switch between
 explore and analyse ditched fileList -> STATE.openFIles

---
 index.html   |   4 +-
 js/state.js  |   2 +-
 js/ui.js     | 285 +++++++++++++++++++++++++++++----------------------
 js/worker.js | 110 +++++++++++---------
 4 files changed, 224 insertions(+), 177 deletions(-)

diff --git a/index.html b/index.html
index d5a5e01d..fc64fddd 100644
--- a/index.html
+++ b/index.html
@@ -753,8 +753,8 @@ <h5>Saved Records</h5>
                             <li class="dropdown-item disabled" id="explore">
                                 <span class="material-symbols-outlined">explore</span> Explore Archive
                             </li>
-                            <li class="dropdown-item d-none" id="restore">
-                                <span class="material-symbols-outlined">youtube_searched_for</span> Restore Latest Analysis
+                            <li class="dropdown-item disabled" id="active-analysis">
+                                <span class="material-symbols-outlined">youtube_searched_for</span> Return to Active Analysis
                             </li>
                             <li class="dropdown-divider"></li>
                             <li class="dropdown-item disabled" id="compress-and-organise">
diff --git a/js/state.js b/js/state.js
index e6672e7e..c2298b62 100644
--- a/js/state.js
+++ b/js/state.js
@@ -32,7 +32,7 @@ export class State {
             this.list = 'everything',
             this.customList = undefined,
             this.local = true,
-            this.incrementor = 1,
+            this.incrementor = 10,
             this.UUID = 0,
             this.track = true,
             this.powerSaveBlocker = false,
diff --git a/js/ui.js b/js/ui.js
index 3a990fed..2c135262 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -1,6 +1,6 @@
 import {trackVisit, trackEvent} from './tracking.js';
 
-let shownDaylightBanner = false, LOCATIONS, locationID = undefined, loadingTimeout;
+let LOCATIONS, locationID = undefined, loadingTimeout;
 const startTime = performance.now();
 let LABELS = [], DELETE_HISTORY = [];
 // Save console.warn and console.error functions
@@ -54,6 +54,7 @@ window.addEventListener('rejectionhandled', function(event) {
 });
 
 const STATE = {
+    guano: {},
     mode: 'analyse',
     analysisDone: false,
     openFiles: [],
@@ -68,7 +69,8 @@ const STATE = {
     },
     sortOrder: 'timestamp',
     birdList: { lastSelectedSpecies: undefined }, // Used to put the last selected species at the top of the all-species list
-    selection: { start: undefined, end: undefined }
+    selection: { start: undefined, end: undefined },
+    currentAnalysis: {file: null, openFiles: [],  mode: null, species: null, offset: 0, active: null}
 }
 
 // Batch size map for slider
@@ -154,8 +156,6 @@ window.electron.getVersion()
 let modelReady = false, fileLoaded = false, currentFile;
 let PREDICTING = false, t0;
 let region, AUDACITY_LABELS = {}, wavesurfer;
-// fileList is all open files, analyseList is the subset that have been analysed;
-let fileList = [], analyseList = [];
 let fileStart, bufferStartTime, fileEnd;
 
 
@@ -182,6 +182,7 @@ const DOM = {
     get audioNotification() { if (!this._audioNotification) { this._audioNotification = document.getElementById('audio-notification') } return this._audioNotification},
     get batchSizeSlider() { if (!this._batchSizeSlider) { this._batchSizeSlider = document.getElementById('batch-size') } return this._batchSizeSlider},
     get batchSizeValue() { if (!this._batchSizeValue) { this._batchSizeValue = document.getElementById('batch-size-value') } return this._batchSizeValue},
+    get chartsLink() { if (!this._chartsLink) { this._chartsLink = document.getElementById('charts') } return this._chartsLink},
     get colourmap() { if (!this._colourmap) { this._colourmap = document.getElementById('colourmap') } return this._colourmap},
     get contentWrapper() { if (!this._contentWrapper) { this._contentWrapper = document.getElementById('contentWrapper') } return this._contentWrapper},
     get controlsWrapper() { if (!this._controlsWrapper) { this._controlsWrapper = document.getElementById('controlsWrapper') } return this._controlsWrapper},
@@ -190,6 +191,7 @@ const DOM = {
     get debugMode() { if (!this._debugMode) { this._debugMode = document.getElementById('debug-mode') } return this._debugMode},
     get defaultLat() { if (!this._defaultLat) { this._defaultLat = document.getElementById('latitude') } return this._defaultLat},
     get defaultLon() { if (!this._defaultLon) { this._defaultLon = document.getElementById('longitude') } return this._defaultLon},
+    get exploreLink() { if (!this._exploreLink) { this._exploreLink = document.getElementById('explore') } return this._exploreLink},
     get exploreWrapper() { if (!this._exploreWrapper) { this._exploreWrapper = document.getElementById('exploreWrapper') } return this._exploreWrapper},
     get fileNumber() { if (!this._fileNumber) { this._fileNumber = document.getElementById('fileNumber') } return this._fileNumber},
     get footer() { if (!this._footer) { this._footer = document.querySelector('footer') } return this._footer },
@@ -316,7 +318,6 @@ function resetResults({clearSummary = true, clearPagination = true, clearResults
         DOM.resultHeader.textContent = '';
     }
     predictions = {};
-    shownDaylightBanner = false;
     DOM.progressDiv.classList.add('d-none');
     updateProgress(0)
 }
@@ -345,7 +346,7 @@ function updateProgress(val) {
 * @param {*} preserveResults: whether to clear results when opening file (i.e. don't clear results when clicking file in list of open files)
 *  
 */
-async function loadAudioFile({ filePath = '', preserveResults = false }) {
+function loadAudioFile({ filePath = '', preserveResults = false }) {
     fileLoaded = false; locationID = undefined;
     //if (!preserveResults) worker.postMessage({ action: 'change-mode', mode: 'analyse' })
     worker.postMessage({
@@ -582,7 +583,7 @@ function powerSave(on) {
 
 const openFileInList = async (e) => {
     if (!PREDICTING && e.target.tagName === 'A') {
-        await loadAudioFile({ filePath: e.target.id, preserveResults: true })
+        loadAudioFile({ filePath: e.target.id, preserveResults: true })
     }
 }
 
@@ -716,14 +717,14 @@ function formatAsBootstrapTable(jsonData) {
 }
 function showGUANO(){
     const icon = document.getElementById('guano');
-    if (STATE.guano){
+    if (STATE.guano[currentFile]){
         icon.classList.remove('d-none');
         icon.setAttribute('data-bs-content', 'New content for the popover');
         // Reinitialize the popover to reflect the updated content
         const popover = bootstrap.Popover.getInstance(icon);
         popover.setContent({
             '.popover-header': 'GUANO Metadata',
-            '.popover-body': formatAsBootstrapTable(STATE.guano)
+            '.popover-body': formatAsBootstrapTable(STATE.guano[currentFile])
           });
     } else {
         icon.classList.add('d-none');
@@ -733,7 +734,7 @@ function showGUANO(){
 function renderFilenamePanel() {
     if (!currentFile) return;
     const openfile = currentFile;
-    const files = fileList;
+    const files = STATE.openFiles;
     showGUANO();
     let filenameElement = DOM.filename;
     filenameElement.innerHTML = '';
@@ -928,7 +929,7 @@ async function setCustomLocation() {
     const customPlaceEl = document.getElementById('customPlace');
     const locationAdd = document.getElementById('set-location');
     const batchWrapper = document.getElementById('location-batch-wrapper');
-    fileList.length > 1 ? batchWrapper.classList.remove('d-none') : batchWrapper.classList.add('d-none');
+    STATE.openFiles.length > 1 ? batchWrapper.classList.remove('d-none') : batchWrapper.classList.add('d-none');
     // Use the current file location for lat, lon, place or use defaults
     showLocation(false);
     savedLocationSelect.addEventListener('change', function (e) {
@@ -1005,13 +1006,13 @@ async function onOpenFiles(args) {
     resetResults({clearSummary: true, clearPagination: true, clearResults: true});
     resetDiagnostics();
     // Store the file list and Load First audio file
-    fileList = sanitisedList;
-    fileList.length > 1 && fileList.length < 25_000 && worker.postMessage({action: 'check-all-files-saved', files: fileList});
-    STATE.openFiles = fileList;
+    STATE.openFiles = sanitisedList;
+    STATE.openFiles.length > 1 && STATE.openFiles.length < 25_000 && worker.postMessage({action: 'check-all-files-saved', files: STATE.openFiles});
+
     // Sort file by time created (the oldest first):
-    if (fileList.length > 1) {
+    if (STATE.openFiles.length > 1) {
         if (modelReady) enableMenuItem(['analyseAll', 'reanalyseAll'])
-        fileList = fileList.map(fileName => ({
+        STATE.openFiles = STATE.openFiles.map(fileName => ({
             name: fileName,
             time: fs.statSync(fileName).mtime.getTime(),
         }))
@@ -1022,7 +1023,7 @@ async function onOpenFiles(args) {
     }
     // Reset analysis status
     STATE.analysisDone = false;
-    await loadAudioFile({ filePath: fileList[0] });
+    loadAudioFile({ filePath: STATE.openFiles[0] });
     disableMenuItem(['analyseSelection', 'analyse', 'analyseAll', 'reanalyse', 'reanalyseAll', 'save2db'])
     // Clear unsaved records warning
     window.electron.unsavedRecords(false);
@@ -1054,7 +1055,6 @@ function resetDiagnostics() {
 function analyseReset() {
     clearActive();
     DOM.fileNumber.textContent = '';
-    if (STATE.mode === 'analyse') PREDICTING = true;
     resetDiagnostics();
     AUDACITY_LABELS = {};
     DOM.progressDiv.classList.remove('d-none');
@@ -1073,7 +1073,7 @@ function refreshResultsView() {
         if (!isEmptyObject(predictions)) {
             showElement(['resultTableContainer', 'resultsHead'], false);
         }
-    } else if (!fileList.length) {
+    } else if (!STATE.openFiles.length) {
         hideAll();
     }
 }
@@ -1105,7 +1105,7 @@ function postAnalyseMessage(args) {
         disableMenuItem(['analyseSelection']);
         const selection = !!args.end;
         const filesInScope = args.filesInScope;
-
+        PREDICTING = true;
         if (!selection) {
             analyseReset();
             refreshResultsView();
@@ -1254,7 +1254,7 @@ async function exportData(format, species, limit, duration){
             format: format,
             duration: duration,
             species: species,
-            files: isExplore() ? [] : fileList,
+            files: isExplore() ? [] : STATE.openFiles,
             explore: isExplore(),
             limit: limit,
             range: isExplore() ? STATE.explore.range : undefined
@@ -1262,19 +1262,6 @@ async function exportData(format, species, limit, duration){
     } 
 }
 
-const chartsLink = document.getElementById('charts');
-chartsLink.addEventListener('click', async () => {
-    // Tell the worker we are in Chart mode
-    worker.postMessage({ action: 'change-mode', mode: 'chart' });
-    // Disable analyse file links
-    disableMenuItem(['analyse', 'analyseSelection', 'analyseAll', 'reanalyse', 'reanalyseAll'])
-    worker.postMessage({ action: 'get-detected-species-list', range: STATE.chart.range });
-    const locationFilter = await generateLocationList('chart-locations');
-    locationFilter.addEventListener('change', handleLocationFilterChange);
-    hideAll();
-    showElement(['recordsContainer']);
-    worker.postMessage({ action: 'chart', species: undefined, range: STATE.chart.range });
-});
 
 const handleLocationFilterChange = (e) => {
     const location = e.target.value || undefined;
@@ -1285,8 +1272,41 @@ const handleLocationFilterChange = (e) => {
     if (STATE.mode === 'explore') filterResults() 
 }
 
-const exploreLink = document.getElementById('explore');
-exploreLink.addEventListener('click', async () => {
+function saveAnalyseState() {
+    if (['analyse', 'archive'].includes(STATE.mode)){
+        // Store a reference to the current file
+        STATE.currentAnalysis = {
+            file: currentFile, 
+            openFiles: STATE.openFiles,  
+            mode: STATE.mode,
+            species: isSpeciesViewFiltered(true),
+            offset: STATE.offset,
+            active: activeRow?.rowIndex -1,
+            analysisDone: STATE.analysisDone
+        }
+    }
+}
+
+async function showCharts() {
+    saveAnalyseState();
+    enableMenuItem(['active-analysis', 'explore']);
+    disableMenuItem(['analyse', 'analyseSelection', 'analyseAll', 'reanalyse', 'reanalyseAll', 'charts'])
+    // Tell the worker we are in Chart mode
+    worker.postMessage({ action: 'change-mode', mode: 'chart' });
+    // Disable analyse file links
+    worker.postMessage({ action: 'get-detected-species-list', range: STATE.chart.range });
+    const locationFilter = await generateLocationList('chart-locations');
+    locationFilter.addEventListener('change', handleLocationFilterChange);
+    hideAll();
+    showElement(['recordsContainer']);
+    worker.postMessage({ action: 'chart', species: undefined, range: STATE.chart.range });
+};
+
+async function showExplore() {
+    saveAnalyseState();
+    enableMenuItem(['saveCSV', 'save-eBird', 'save-Raven', 'charts', 'active-analysis']);
+    disableMenuItem(['explore', 'save2db']);
+    STATE.openFiles = [];
     // Tell the worker we are in Explore mode
     worker.postMessage({ action: 'change-mode', mode: 'explore' });
     worker.postMessage({ action: 'get-detected-species-list', range: STATE.explore.range });
@@ -1294,22 +1314,36 @@ exploreLink.addEventListener('click', async () => {
     locationFilter.addEventListener('change', handleLocationFilterChange);
     hideAll();
     showElement(['exploreWrapper'], false);
-    enableMenuItem(['saveCSV', 'save-eBird', 'save-Raven']);
-    worker.postMessage({ action: 'update-state', globalOffset: 0, filteredOffset: {}});
+    worker.postMessage({ action: 'update-state', filesToAnalyse: []});
     // Analysis is done
     STATE.analysisDone = true;
-    filterResults({species: undefined, range: STATE.explore.range});
-    resetResults({clearSummary: true, clearPagination: true, clearResults: true});
-});
+    filterResults({species: isSpeciesViewFiltered(true), range: STATE.explore.range});
+    resetResults();
 
-const restoreLink = document.getElementById('restore');
-restoreLink.addEventListener('click', async () => {
-    // Todo: Placeholder for results restore
-    worker.postMessage({ action: 'change-mode', mode: 'analyse' });
+};
+
+async function showAnalyse() {
+    disableMenuItem(['active-analysis']);
+    STATE.diskHasRecords && enableMenuItem(['save2db', 'explore', 'charts']);
+    STATE.mode = STATE.currentAnalysis.mode
+    // Tell the worker we are in Analyse/Archive mode
+    worker.postMessage({ action: 'change-mode', mode: STATE.mode });
     hideAll();
-    showElement(['spectrogramWrapper', 'resultTableContainer']);
-    worker.postMessage({ action: 'filter', updateSummary: true });
-});
+    currentFile = STATE.currentAnalysis.file;
+    STATE.openFiles = STATE.currentAnalysis.openFiles;
+    STATE.analysisDone = STATE.currentAnalysis.analysisDone;
+    if (currentFile) {
+        showElement(['spectrogramWrapper'], false);
+        worker.postMessage({ action: 'update-state', filesToAnalyse: STATE.openFiles});
+        STATE.analysisDone && worker.postMessage({ action: 'filter', 
+            species: STATE.currentAnalysis.species, 
+            offset: STATE.currentAnalysis.offset, 
+            active: STATE.currentAnalysis.active, 
+            updateSummary: true });
+    }
+    resetResults();
+};
+
 
 // const datasetLink = document.getElementById('dataset');
 // datasetLink.addEventListener('click', async () => {
@@ -1365,7 +1399,7 @@ selectionTable.addEventListener('click', resultClick);
 async function resultClick(e) {
     let row = e.target.closest('tr');
     if (!row || row.classList.length === 0) { 
-        // 1. clicked and dragged, 2 no detections in file row, 3. already selected this row
+        // 1. clicked and dragged, 2 no detections in file row
         return
     }
     
@@ -1376,7 +1410,7 @@ async function resultClick(e) {
         return;
     }
     
-    // Search for results rows
+    // Search for results rows - Why???
     while (!(row.classList.contains('nighttime') ||
     row.classList.contains('daytime'))) {
         row = row.previousElementSibling
@@ -1446,7 +1480,7 @@ function adjustSpecDims(redraw, fftSamples, newHeight) {
         if (wavesurfer && redraw) {
             specOffset = spectrogramWrapper.offsetHeight;
         }
-            } else {
+    } else {
         specOffset = 0
     }
     DOM.resultTableElement.style.height = (contentHeight - specOffset - formOffset) + 'px';
@@ -1920,9 +1954,10 @@ const setUpWorkerMessaging = () => {
                     break;
                 }
                 case "diskDB-has-records": {
-                    chartsLink.classList.remove("disabled");
-                    exploreLink.classList.remove("disabled");
+                    DOM.chartsLink.classList.remove("disabled");
+                    DOM.exploreLink.classList.remove("disabled");
                     config.archive.location && document.getElementById('compress-and-organise').classList.remove('disabled');
+                    STATE.diskHasRecords = true;
                     break;
                 }
                 case "file-location-id": {onFileLocationID(args);
@@ -1984,7 +2019,7 @@ const setUpWorkerMessaging = () => {
                         // change header to indicate activation
                         DOM.resultHeader.classList.remove('text-bg-secondary');
                         DOM.resultHeader.classList.add('text-bg-dark');
-                        adjustSpecDims(true)
+                        //adjustSpecDims(true)
                     } else {
                         disableMenuItem(['purge-file']);
                         // change header to indicate deactivation
@@ -2005,8 +2040,6 @@ const setUpWorkerMessaging = () => {
                 // called when an analysis ends, or when the filesbeingprocessed list is empty
                 case "processing-complete": {
                     STATE.analysisDone = true;
-                    //PREDICTING = false;
-                    //DOM.progressDiv.classList.add('d-none');
                     break;
                 }
                 case 'ready-for-tour':{
@@ -2646,7 +2679,7 @@ function onChartData(args) {
         DOM.listToUse.value = config.list;
         updateListIcon();
         updatePrefs('config.json', config)
-        resetResults({clearSummary: true, clearPagination: true, clearResults: true});
+        resetResults();
         setListUIState(config.list);
         // Since the custom list function calls for its own update *after* reading the labels, we'll skip updates for custom lists here
         config.list === 'custom' || worker.postMessage({ action: 'update-list', list: config.list, refreshResults: STATE.analysisDone })
@@ -2667,6 +2700,7 @@ function onChartData(args) {
 
    
     const loadModel = ()  => {
+        PREDICTING = false;
         t0_warmup = Date.now();
         worker.postMessage({
             action: 'load-model',
@@ -2702,7 +2736,6 @@ function onChartData(args) {
                     contextAwareIconDisplay();
                 }
             }
-            PREDICTING = false;
         }
         // Update threads and batch Size in UI
         DOM.threadSlider.value = config[config[config.model].backend].threads;
@@ -3018,7 +3051,7 @@ function centreSpec(){
         sampleRate = args.sampleRate;
         if (fileLoaded) {
             enableMenuItem(['analyse'])
-            if (fileList.length > 1) enableMenuItem(['analyseAll', 'reanalyseAll'])
+            if (STATE.openFiles.length > 1) enableMenuItem(['analyseAll', 'reanalyseAll'])
         }
         if (region) enableMenuItem(['analyseSelection'])
         t1_warmup = Date.now();
@@ -3079,11 +3112,14 @@ function centreSpec(){
             NEXT_BUFFER = undefined;
             if (currentFile !== file) {
                 currentFile = file;
-                STATE.guano = guano;
-                renderFilenamePanel();
+
                 fileStart = start;
                 fileEnd = new Date(fileStart + (currentFileDuration * 1000));
             }
+            
+            STATE.guano[currentFile] = guano;
+            renderFilenamePanel();
+
             if (config.timeOfDay) {
                 bufferStartTime = new Date(fileStart + (bufferBegin * 1000))
             } else {
@@ -3097,7 +3133,7 @@ function centreSpec(){
             wavesurfer.bufferRequested = false;
             if (modelReady) {
                 enableMenuItem(['analyse']);
-                if (fileList.length > 1) enableMenuItem(['analyseAll'])
+                if (STATE.openFiles.length > 1) enableMenuItem(['analyseAll'])
             }
             if (fileRegion) {
                 createRegion(fileRegion.start, fileRegion.end, fileRegion.label, goToRegion);
@@ -3105,7 +3141,7 @@ function centreSpec(){
                     region.play()
                 }
             } else {
-                clearActive();
+                //clearActive();
             }
             fileLoaded = true;
             //if (activeRow) activeRow.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
@@ -3118,8 +3154,8 @@ function centreSpec(){
             DOM.fileNumber.innerHTML = args.text;
         } else {
             DOM.progressDiv.classList.remove('d-none');
-            const count = fileList.indexOf(args.file) + 1;
-            DOM.fileNumber.textContent = `File ${count} of ${fileList.length}`;
+            const count = STATE.openFiles.indexOf(args.file) + 1;
+            DOM.fileNumber.textContent = `File ${count} of ${STATE.openFiles.length}`;
         }
         if (args.progress) {
             let progress = Math.round(args.progress * 1000) / 10;
@@ -3132,48 +3168,50 @@ function centreSpec(){
     function updatePagination(total, offset) {
         //Pagination
         total > config.limit ? addPagination(total, offset) : pagination.forEach(item => item.classList.add('d-none'));
+        STATE.offset = offset;
     }
     
     const updateSummary = ({ summary = [], filterSpecies = '' }) => {
-        let total, summaryHTML = `<table id="resultSummary" class="table table-dark p-1"><thead>
-        <tr>
-        <th class="col-3" scope="col">Max</th>
-        <th class="col-5" scope="col">Species</th>
-        <th class="col-1 text-end" scope="col">Detections</th>
-        <th class="col-1 text-end" scope="col">Calls</th>
-        </tr>
-        </thead><tbody id="speciesFilter">`;
-        
-        for (let i = 0; i < summary.length; i++) {
-            const item = summary[i];
-            const selected = item.cname === filterSpecies ? ' text-warning' : '';
-            summaryHTML += `<tr tabindex="-1" class="${selected}">
-            <td class="max">${iconizeScore(item.max)}</td>
-            <td class="cname">
-            <span class="cname">${item.cname}</span> <br><i>${item.sname}</i>
-            </td>
-            <td class="text-end">${item.count}</td>
-            <td class="text-end">${item.calls}</td>
-            </tr>`;
+        if (summary.length){
+            let summaryHTML = `<table id="resultSummary" class="table table-dark p-1"><thead>
+            <tr>
+            <th class="col-3" scope="col">Max</th>
+            <th class="col-5" scope="col">Species</th>
+            <th class="col-1 text-end" scope="col">Detections</th>
+            <th class="col-1 text-end" scope="col">Calls</th>
+            </tr>
+            </thead><tbody id="speciesFilter">`;
             
+            for (let i = 0; i < summary.length; i++) {
+                const item = summary[i];
+                const selected = item.cname === filterSpecies ? ' text-warning' : '';
+                summaryHTML += `<tr tabindex="-1" class="${selected}">
+                <td class="max">${iconizeScore(item.max)}</td>
+                <td class="cname">
+                <span class="cname">${item.cname}</span> <br><i>${item.sname}</i>
+                </td>
+                <td class="text-end">${item.count}</td>
+                <td class="text-end">${item.calls}</td>
+                </tr>`;
+                
+            }
+            summaryHTML += '</tbody></table>';
+            // Get rid of flicker...
+            const old_summary = summaryTable;
+            const buffer = old_summary.cloneNode();
+            buffer.innerHTML = summaryHTML;
+            old_summary.replaceWith(buffer);
         }
-        summaryHTML += '</tbody></table>';
-        // Get rid of flicker...
-        const old_summary = summaryTable;
-        const buffer = old_summary.cloneNode();
-        buffer.innerHTML = summaryHTML;
-        old_summary.replaceWith(buffer);
-        const currentFilter = document.querySelector('#speciesFilter tr.text-warning');
     }
     
     /*
     onResultsComplete is called when the last result is sent from the database
     */
     function onResultsComplete({active = undefined, select = undefined} = {}){
-        let table = document.getElementById('resultTableBody');
-        table.replaceWith(resultsBuffer);
-        table = document.getElementById('resultTableBody');
-
+        PREDICTING = false;
+        DOM.resultTable.replaceWith(resultsBuffer);
+        const table = DOM.resultTable;
+        showElement(['resultTableContainer', 'resultsHead'], false);
         // Set active Row        
         if (active) {
             // Refresh node and scroll to active row:
@@ -3183,9 +3221,7 @@ function centreSpec(){
                 if (rows.length) {
                     activeRow = rows[rows.length - 1];
                 }
-            } else {
-                activeRow.classList.add('table-active');
-            }
+            } 
         } else if (select) {
             const row = getRowFromStart(table, select)
             activeRow = table.rows[row];
@@ -3204,7 +3240,7 @@ function centreSpec(){
         }
         // hide progress div
         DOM.progressDiv.classList.add('d-none');
-        
+        renderFilenamePanel();
     }
 
     function getRowFromStart(table, start){
@@ -3259,12 +3295,14 @@ function centreSpec(){
         if (! PREDICTING  || STATE.mode !== 'analyse') activateResultFilters();
         // Why do we do audacity labels here?
         AUDACITY_LABELS = audacityLabels;
-        if (! isEmptyObject(AUDACITY_LABELS)) {
-            enableMenuItem(['saveLabels', 'saveCSV', 'save-eBird', 'save-Raven', 'save2db']);
+        if (isEmptyObject(AUDACITY_LABELS)) {
+            disableMenuItem(['saveLabels', 'saveCSV', 'save-eBird', 'save-Raven', 'save2db']);
         } else {
-            disableMenuItem(['saveLabels', 'saveCSV', 'save-eBird', 'save-Raven']);
+            enableMenuItem(['saveLabels', 'saveCSV', 'save-eBird', 'save-Raven']);
+            STATE.mode !== 'explore' && enableMenuItem(['save2db'])            
         }
         if (currentFile) enableMenuItem(['analyse'])
+        adjustSpecDims(true)
     }
     
     
@@ -3377,8 +3415,8 @@ function centreSpec(){
                 selectionTable.textContent = '';
             }
             else {
-                adjustSpecDims(true); 
-                if (isFromDB) PREDICTING = false;
+                //adjustSpecDims(true); 
+                //if (isFromDB) PREDICTING = false;
                 
                 DOM.resultHeader.innerHTML =`
                 <tr>
@@ -3417,17 +3455,6 @@ function centreSpec(){
             // Todo: move this logic so pre dark sections of file are not even analysed
             if (config.detect.nocmig && !selection && dayNight === 'daytime') return
             
-            // Show twilight indicator when  nocmig mode off (except when analysing a selection)
-            if (shownDaylightBanner === false && dayNight === 'daytime' && STATE.sortOrder === 'timestamp') {
-                // Only do this if change starts midway through a file
-                if ((index - 1) % config.limit !== 0) {
-                    // Show the twilight start bar
-                    tr += `<tr class="text-bg-dark"><td colspan="20" class="text-center text-white">
-                    Start of civil twilight <span class="material-symbols-outlined text-warning align-bottom">wb_twilight</span>
-                    </td></tr>`;
-                }
-                shownDaylightBanner = true;
-            }
             const commentHTML = comment ?
             `<span title="${comment.replaceAll('"', '&quot;')}" class='material-symbols-outlined pointer'>comment</span>` : '';
             const isUncertain = score < 65 ? '&#63;' : '';
@@ -4284,7 +4311,7 @@ function centreSpec(){
             action: 'update-state',
             detect: { confidence: config.detect.confidence }
         });
-        if (STATE.mode == 'explore') {
+        if (STATE.mode === 'explore') {
             // Update the seen species list
             worker.postMessage({ action: 'get-detected-species-list' })
         }
@@ -4418,6 +4445,7 @@ DOM.gain.addEventListener('input', () => {
         const target = e.target.closest('[id]')?.id;
         switch (target)
         {
+            // File menu
             case 'open-file': { showOpenDialog('openFile'); break }
             case 'open-folder': { showOpenDialog('openDirectory'); break }
             case 'saveLabels': { showSaveDialog(); break }
@@ -4427,17 +4455,26 @@ DOM.gain.addEventListener('input', () => {
             case 'export-audio': { exportAudio(); break }
             case 'exit': { exitApplication(); break }
 
+
+            case 'dataset': { worker.postMessage({ action: 'create-dataset', species: isSpeciesViewFiltered(true) }); break }
+            
+            // Records menu
             case 'save2db': { 
                 worker.postMessage({ action: 'save2db', file: currentFile }); 
                 if (config.archive.auto) document.getElementById('compress-and-organise').click();
                 break }
-            case 'dataset': { worker.postMessage({ action: 'create-dataset', species: isSpeciesViewFiltered(true) }); break }
+            case 'charts': { showCharts(); break }
+            case 'explore': { showExplore(); break }
+            case 'active-analysis': { showAnalyse(); break }
+            case 'compress-and-organise': {compressAndOrganise(); break}
+            case 'purge-file': { deleteFile(currentFile); break }
 
+            //Analyse menu
             case 'analyse': {postAnalyseMessage({ filesInScope: [currentFile] }); break }
             case 'analyseSelection': {getSelectionResults(); break }
-            case 'analyseAll': {postAnalyseMessage({ filesInScope: fileList }); break }
+            case 'analyseAll': {postAnalyseMessage({ filesInScope: STATE.openFiles }); break }
             case 'reanalyse': {postAnalyseMessage({ filesInScope: [currentFile], reanalyse: true }); break }
-            case 'reanalyseAll': {postAnalyseMessage({ filesInScope: fileList, reanalyse: true }); break }
+            case 'reanalyseAll': {postAnalyseMessage({ filesInScope: STATE.openFiles, reanalyse: true }); break }
             
             case 'purge-from-toast': { deleteFile(MISSING_FILE); break }
             case 'locate-missing-file': {
@@ -4456,8 +4493,8 @@ DOM.gain.addEventListener('input', () => {
                 if (currentFile && STATE.analysisDone) worker.postMessage({ action: 'update-list', list: config.list, refreshResults: true })
                 break;
             }
-            case 'compress-and-organise': {compressAndOrganise(); break}
-            case 'purge-file': { deleteFile(currentFile); break }
+            
+            
 
             case 'keyboardHelp': { (async () => await populateHelpModal('Help/keyboard.html', 'Keyboard shortcuts'))(); break }
             case 'settingsHelp': { (async () => await populateHelpModal('Help/settings.html', 'Settings Help'))(); break }
@@ -5069,7 +5106,7 @@ async function readLabels(labelFile, updating){
     
     
     const insertManualRecord = (cname, start, end, comment, count, label, action, batch, originalCname, confidence) => {
-        const files = batch ? fileList : currentFile;
+        const files = batch ? STATE.openFiles : currentFile;
         worker.postMessage({
             action: 'insert-manual-record',
             cname: cname,
@@ -5233,7 +5270,7 @@ async function readLabels(labelFile, updating){
             const example_file = await window.electron.getAudio();
             // create a canvas for the audio spec
             showElement(['spectrogramWrapper'], false);
-            await loadAudioFile({ filePath: example_file });
+            loadAudioFile({ filePath: example_file });
         }
         startTour();
     }
diff --git a/js/worker.js b/js/worker.js
index 151d0553..4cbd2708 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -374,6 +374,7 @@ async function handleMessage(e) {
             let {model, batchSize, threads, backend, list} = args;
             const t0 = Date.now();
             STATE.detect.backend = backend;
+            setGetSummaryQueryInterval()
             INITIALISED = (async () => {
                 LIST_WORKER = await spawnListWorker(); // this can change the backend if tfjs-node isn't available
                 DEBUG && console.log('List worker took', Date.now() - t0, 'ms to load');
@@ -407,6 +408,7 @@ async function handleMessage(e) {
         }
         case 'change-threads': {
             const threads = e.data.threads;
+            setGetSummaryQueryInterval()
             const delta = threads - predictWorkers.length;
             NUM_WORKERS+=delta;
             if (delta > 0) {
@@ -459,15 +461,11 @@ async function handleMessage(e) {
         }
         case "filter": {
             if (STATE.db) {
-                t0 = Date.now();
                 await getResults(args);
-                const t1 = Date.now();
                 args.updateSummary && await getSummary(args);
-                const t2 = Date.now();
                 args.included = await getIncludedIDs(args.file);
                 const [total, offset, species] = await getTotal(args);
                 UI.postMessage({event: 'total-records', total: total, offset: offset, species: species})
-                DEBUG && console.log("Filter took", (Date.now() - t0) / 1000, "seconds", "GetTotal took", (Date.now() - t2) / 1000, "seconds", "GetSummary took", (t2 - t1) / 1000, "seconds");
             }
             break;
         }
@@ -586,6 +584,11 @@ function savedFileCheck(fileList) {
     }
 }
 
+function setGetSummaryQueryInterval(threads){
+    STATE.detect.backend !== 'tensorflow' ? threads * 10 : threads;
+    STATE.incrementor = STATE.detect.backend !== 'tensorflow' ? threads * 10 : threads;
+}
+
 async function onChangeMode(mode) {
     memoryDB || await createDB();
     UI.postMessage({ event: 'mode-changed', mode: mode })
@@ -1298,6 +1301,7 @@ function checkBacklog(stream) {
     });
 }
 
+
 /**
 *
 * @param file
@@ -1679,7 +1683,6 @@ async function feedChunksToModel(channelData, chunkStart, file, end, worker) {
     if (predictWorkers[worker]) predictWorkers[worker].isAvailable = false;
     predictWorkers[worker]?.postMessage(objData, [channelData.buffer]);
 }
-
 async function doPrediction({
     file = '',
     start = 0,
@@ -2229,7 +2232,7 @@ const generateInsertQuery = async (latestResult, file) => {
         const speciesIDArray = speciesIDBatch[i];
         for (let j = 0; j < confidenceArray.length; j++) {
             const confidence = Math.round(confidenceArray[j] * 1000);
-            if (confidence < 50) break;
+            if (confidence < STATE.detect.confidence) break;
             const speciesID = speciesIDArray[j];
             insertQuery += `(${timestamp}, ${key}, ${fileID}, ${speciesID}, ${confidence}, null, null, ${key + 3}, null, ${isDaylight}), `;
         }
@@ -2246,53 +2249,55 @@ const generateInsertQuery = async (latestResult, file) => {
 
 const parsePredictions = async (response) => {
     let file = response.file;
-    const included = await getIncludedIDs(file).catch( (error) => console.log('Error getting included IDs', error));
-    const latestResult = response.result, db = STATE.db;
+
+    const latestResult = response.result;
     DEBUG && console.log('worker being used:', response.worker);
     if (! STATE.selection) await generateInsertQuery(latestResult, file).catch(error => console.warn('Error generating insert query', error));
     let [keysArray, speciesIDBatch, confidenceBatch] = latestResult;
-    for (let i = 0; i < keysArray.length; i++) {
-        let updateUI = false;
-        let key = parseFloat(keysArray[i]);
-        const timestamp = METADATA[file].fileStart + key * 1000;
-        const confidenceArray = confidenceBatch[i];
-        const speciesIDArray = speciesIDBatch[i];
-        for (let j = 0; j < confidenceArray.length; j++) {
-            let confidence = confidenceArray[j];
-            if (confidence < 0.05) break;
-            confidence*=1000;
-            let speciesID = speciesIDArray[j];
-            updateUI = (confidence > STATE.detect.confidence && (! included.length || included.includes(speciesID)));
-            if (STATE.selection || updateUI) {
-                let end, confidenceRequired;
-                if (STATE.selection) {
-                    const duration = (STATE.selection.end - STATE.selection.start) / 1000;
-                    end = key + duration;
-                    confidenceRequired = STATE.userSettingsInSelection ?
-                    STATE.detect.confidence : 50;
-                } else {
-                    end = key + 3;
-                    confidenceRequired = STATE.detect.confidence;
-                }
-                if (confidence >= confidenceRequired) {
-                    const { cname, sname } = await memoryDB.getAsync(`SELECT cname, sname FROM species WHERE id = ${speciesID}`).catch(error => console.warn('Error getting species name', error));
-                    const result = {
-                        timestamp: timestamp,
-                        position: key,
-                        end: end,
-                        file: file,
-                        cname: cname,
-                        sname: sname,
-                        score: confidence
+    if (index <= 500){
+        const included = await getIncludedIDs(file).catch( (error) => console.log('Error getting included IDs', error));
+        for (let i = 0; i < keysArray.length; i++) {
+            let updateUI = false;
+            let key = parseFloat(keysArray[i]);
+            const timestamp = METADATA[file].fileStart + key * 1000;
+            const confidenceArray = confidenceBatch[i];
+            const speciesIDArray = speciesIDBatch[i];
+            for (let j = 0; j < confidenceArray.length; j++) {
+                let confidence = confidenceArray[j];
+                if (confidence < 0.05) break;
+                confidence*=1000;
+                let speciesID = speciesIDArray[j];
+                updateUI = (confidence > STATE.detect.confidence && (! included.length || included.includes(speciesID)));
+                if (STATE.selection || updateUI) {
+                    let end, confidenceRequired;
+                    if (STATE.selection) {
+                        const duration = (STATE.selection.end - STATE.selection.start) / 1000;
+                        end = key + duration;
+                        confidenceRequired = STATE.userSettingsInSelection ?
+                        STATE.detect.confidence : 50;
+                    } else {
+                        end = key + 3;
+                        confidenceRequired = STATE.detect.confidence;
                     }
-                    sendResult(++index, result, false);
-                    // Only show the highest confidence detection, unless it's a selection analysis
-                    if (! STATE.selection) break;
-                };
+                    if (confidence >= confidenceRequired) {
+                        const { cname, sname } = await memoryDB.getAsync(`SELECT cname, sname FROM species WHERE id = ${speciesID}`).catch(error => console.warn('Error getting species name', error));
+                        const result = {
+                            timestamp: timestamp,
+                            position: key,
+                            end: end,
+                            file: file,
+                            cname: cname,
+                            sname: sname,
+                            score: confidence
+                        }
+                        sendResult(++index, result, false);
+                        // Only show the highest confidence detection, unless it's a selection analysis
+                        if (! STATE.selection) break;
+                    };
+                }
             }
-        }
-    } 
-    
+        } 
+    }
     predictionsReceived[file]++;
     const received = sumObjectValues(predictionsReceived);
     const total = sumObjectValues(batchChunksToSend);
@@ -2427,7 +2432,12 @@ async function processNextFile({
 }
 
 function sumObjectValues(obj) {
-    return Object.values(obj).reduce((total, value) => total + value, 0);
+    let total = 0;
+    for (const key in obj) {
+        total += obj[key];
+    }
+    return total;
+    //return Object.values(obj).reduce((total, value) => total + value, 0);
 }
 
 function onSameDay(timestamp1, timestamp2) {
@@ -2678,7 +2688,7 @@ const getResults = async ({
             } else {
                 species = species || '';
                 const nocmig = STATE.detect.nocmig ? '<b>nocturnal</b>' : ''
-                sendResult(++index, `No ${nocmig} ${species} detections found using the ${STATE.list} list.`, true)
+                sendResult(++index, `No ${nocmig} ${species} detections found ${STATE.mode === 'explore' && 'in the Archive'} using the ${STATE.list} list.`, true)
             }
         }
     }

From 6d803d9c564a68c2e9086f9b08e34479ef7322fb Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Wed, 16 Oct 2024 01:14:51 +0100
Subject: [PATCH 02/15] moved currentFile into STATE object onLoad  now both
 fills new keys and removes old ones from config. removed unused SunCalc from
 UI Explore locations list updates immediately when you set a new custom
 location for a file BUG fix: if you start analysing, and then go to explore
 or charts during the analysis, you results would have gone straight to the
 archive! bumped version tooltip positioning ctrl-tab added to keyboard hep

---
 Help/keyboard.html |   4 +
 css/style.css      |   2 +
 js/ui.js           | 232 ++++++++++++++++++++++++++++-----------------
 js/worker.js       |  54 ++++++++---
 package.json       |   2 +-
 5 files changed, 192 insertions(+), 102 deletions(-)

diff --git a/Help/keyboard.html b/Help/keyboard.html
index a04a9a0e..43263587 100644
--- a/Help/keyboard.html
+++ b/Help/keyboard.html
@@ -37,6 +37,10 @@
         <td><b>Esc</b></td>
         <td>Stop analysis</td>
     </tr>
+    <tr>
+        <td><b>Ctrl-Tab</b></td>
+        <td>Toggle between exploring the archive and the latest analysis results. This allows you to compare current detections with those you've previously recorded.</td>
+    </tr>
     <tr>
         <td colspan="2" class="text-center text-bg-light"><h5>Transport Controls</h5></td>
     </tr>
diff --git a/css/style.css b/css/style.css
index eadee84e..a19379fe 100644
--- a/css/style.css
+++ b/css/style.css
@@ -409,6 +409,8 @@ footer {
     border-radius: 5px;
     z-index: 3;
     display: none;
+    opacity: 0;
+    transition: opacity 1.3s ease; /* Smooth transitions for left and right positions */
 }
 /* ============ desktop view .end// ============ */
 
diff --git a/js/ui.js b/js/ui.js
index 2c135262..45ec357d 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -53,7 +53,7 @@ window.addEventListener('rejectionhandled', function(event) {
     config.track && trackEvent(config.UUID, 'Handled UI Promise Rejection', errorMessage, customURLEncode(stackTrace));
 });
 
-const STATE = {
+let STATE = {
     guano: {},
     mode: 'analyse',
     analysisDone: false,
@@ -80,7 +80,6 @@ const BATCH_SIZE_LIST = [4, 8, 16, 32, 48, 64, 96];
 const fs = window.module.fs;
 const colormap = window.module.colormap;
 const p = window.module.p;
-const SunCalc = window.module.SunCalc;
 const uuidv4 = window.module.uuidv4;
 const os = window.module.os;
 
@@ -153,7 +152,7 @@ window.electron.getVersion()
     console.log('Error getting app version:', error)
 });
 
-let modelReady = false, fileLoaded = false, currentFile;
+let modelReady = false, fileLoaded = false;
 let PREDICTING = false, t0;
 let region, AUDACITY_LABELS = {}, wavesurfer;
 let fileStart, bufferStartTime, fileEnd;
@@ -655,7 +654,7 @@ function showDatePicker() {
         const timestamp = new Date(newStart).getTime();
         
         // Send the data to the worker
-        worker.postMessage({ action: 'update-file-start', file: currentFile, start: timestamp });
+        worker.postMessage({ action: 'update-file-start', file: STATE.currentFile, start: timestamp });
         trackEvent(config.UUID, 'Settings Change', 'fileStart', newStart);
         resetResults();
         fileStart = timestamp;
@@ -717,14 +716,14 @@ function formatAsBootstrapTable(jsonData) {
 }
 function showGUANO(){
     const icon = document.getElementById('guano');
-    if (STATE.guano[currentFile]){
+    if (STATE.guano[STATE.currentFile]){
         icon.classList.remove('d-none');
         icon.setAttribute('data-bs-content', 'New content for the popover');
         // Reinitialize the popover to reflect the updated content
         const popover = bootstrap.Popover.getInstance(icon);
         popover.setContent({
             '.popover-header': 'GUANO Metadata',
-            '.popover-body': formatAsBootstrapTable(STATE.guano[currentFile])
+            '.popover-body': formatAsBootstrapTable(STATE.guano[STATE.currentFile])
           });
     } else {
         icon.classList.add('d-none');
@@ -732,8 +731,8 @@ function showGUANO(){
 }
 
 function renderFilenamePanel() {
-    if (!currentFile) return;
-    const openfile = currentFile;
+    if (!STATE.currentFile) return;
+    const openfile = STATE.currentFile;
     const files = STATE.openFiles;
     showGUANO();
     let filenameElement = DOM.filename;
@@ -807,7 +806,7 @@ async function generateLocationList(id) {
     const defaultText = id === 'savedLocations' ? '(Default)' : 'All';
     const el = document.getElementById(id);
     LOCATIONS = undefined;
-    worker.postMessage({ action: 'get-locations', file: currentFile });
+    worker.postMessage({ action: 'get-locations', file: STATE.currentFile });
     await waitForLocations();
     el.innerHTML = `<option value="">${defaultText}</option>`; // clear options
     LOCATIONS.forEach(loc => {
@@ -835,7 +834,7 @@ const showLocation = async (fromSelect) => {
     const customPlaceEl = document.getElementById('customPlace');
     const locationSelect = document.getElementById('savedLocations');
     // Check if currentfile has a location id
-    const id = fromSelect ? parseInt(locationSelect.value) : FILE_LOCATION_MAP[currentFile];
+    const id = fromSelect ? parseInt(locationSelect.value) : FILE_LOCATION_MAP[STATE.currentFile];
     
     if (id) {
         newLocation = LOCATIONS.find(obj => obj.id === id);
@@ -960,8 +959,10 @@ async function setCustomLocation() {
     const addLocation = () => {
         locationID = savedLocationSelect.value;
         const batch = document.getElementById('batchLocations').checked;
-        const files = batch ? STATE.openFiles : [currentFile];
+        const files = batch ? STATE.openFiles : [STATE.currentFile];
         worker.postMessage({ action: 'set-custom-file-location', lat: latEl.value, lon: lonEl.value, place: customPlaceEl.value, files: files })
+        generateLocationList('explore-locations');
+
         locationModal.hide();
     }
     locationAdd.addEventListener('click', addLocation)
@@ -1040,7 +1041,7 @@ async function onOpenFiles(args) {
 * @returns {Promise<void>}
 */
 async function showSaveDialog() {
-    await window.electron.saveFile({ currentFile: currentFile, labels: AUDACITY_LABELS[currentFile] });
+    await window.electron.saveFile({ currentFile: STATE.currentFile, labels: AUDACITY_LABELS[STATE.currentFile] });
 }
 
 function resetDiagnostics() {
@@ -1089,7 +1090,7 @@ const getSelectionResults = (fromDB) => {
     STATE['selection']['end'] = end.toFixed(3);
     
     postAnalyseMessage({
-        filesInScope: [currentFile],
+        filesInScope: [STATE.currentFile],
         start: STATE['selection']['start'],
         end: STATE['selection']['end'],
         offset: 0,
@@ -1102,7 +1103,7 @@ function postAnalyseMessage(args) {
     if (!PREDICTING) {
         // Start a timer
         t0_analysis = Date.now();
-        disableMenuItem(['analyseSelection']);
+        disableMenuItem(['analyseSelection', 'explore', 'charts']);
         const selection = !!args.end;
         const filesInScope = args.filesInScope;
         PREDICTING = true;
@@ -1149,7 +1150,7 @@ async function fetchLocationAddress(lat, lon) {
         openStreetMapTimer = setTimeout(async () => {
             try { 
                 if (!LOCATIONS) {
-                    worker.postMessage({ action: 'get-locations', file: currentFile });
+                    worker.postMessage({ action: 'get-locations', file: STATE.currentFile });
                     await waitForLocations();  // Ensure this is awaited
                 }
                 const response = await fetch(`https://nominatim.openstreetmap.org/reverse?format=jsonv2&lat=${lat}&lon=${lon}&zoom=14`);
@@ -1274,15 +1275,17 @@ const handleLocationFilterChange = (e) => {
 
 function saveAnalyseState() {
     if (['analyse', 'archive'].includes(STATE.mode)){
+        const active = activeRow?.rowIndex -1
         // Store a reference to the current file
         STATE.currentAnalysis = {
-            file: currentFile, 
+            file: STATE.currentFile, 
             openFiles: STATE.openFiles,  
             mode: STATE.mode,
             species: isSpeciesViewFiltered(true),
             offset: STATE.offset,
-            active: activeRow?.rowIndex -1,
-            analysisDone: STATE.analysisDone
+            active: active,
+            analysisDone: STATE.analysisDone,
+            sortOrder: STATE.sortOrder
         }
     }
 }
@@ -1324,21 +1327,17 @@ async function showExplore() {
 
 async function showAnalyse() {
     disableMenuItem(['active-analysis']);
-    STATE.diskHasRecords && enableMenuItem(['save2db', 'explore', 'charts']);
-    STATE.mode = STATE.currentAnalysis.mode
-    // Tell the worker we are in Analyse/Archive mode
+    //Restore STATE
+    STATE = {...STATE, ...STATE.currentAnalysis}
     worker.postMessage({ action: 'change-mode', mode: STATE.mode });
     hideAll();
-    currentFile = STATE.currentAnalysis.file;
-    STATE.openFiles = STATE.currentAnalysis.openFiles;
-    STATE.analysisDone = STATE.currentAnalysis.analysisDone;
-    if (currentFile) {
+    if (STATE.currentFile) {
         showElement(['spectrogramWrapper'], false);
-        worker.postMessage({ action: 'update-state', filesToAnalyse: STATE.openFiles});
+        worker.postMessage({ action: 'update-state', filesToAnalyse: STATE.openFiles, sortOrder: STATE.sortOrder});
         STATE.analysisDone && worker.postMessage({ action: 'filter', 
-            species: STATE.currentAnalysis.species, 
-            offset: STATE.currentAnalysis.offset, 
-            active: STATE.currentAnalysis.active, 
+            species: STATE.species, 
+            offset: STATE.offset, 
+            active: STATE.active, 
             updateSummary: true });
     }
     resetResults();
@@ -1462,7 +1461,7 @@ function adjustSpecDims(redraw, fftSamples, newHeight) {
             config.specMaxHeight = specHeight;
             scheduler.postTask(() => updatePrefs('config.json', config), {priority: 'background'});
         }
-        if (currentFile) {
+        if (STATE.currentFile) {
             // give the wrapper space for the transport controls and element padding/margins
             if (!wavesurfer) {
                 initWavesurfer({
@@ -1675,16 +1674,25 @@ function updatePrefs(file, data) {
     }
 }
 
-function fillDefaults(config, defaultConfig) {
+function syncConfig(config, defaultConfig) {
+    // First, remove keys from config that are not in defaultConfig
+    Object.keys(config).forEach(key => {
+        if (!(key in defaultConfig)) {
+            delete config[key];
+        }
+    });
+
+    // Then, fill in missing keys from defaultConfig
     Object.keys(defaultConfig).forEach(key => {
         if (!(key in config)) {
             config[key] = defaultConfig[key];
         } else if (typeof config[key] === 'object' && typeof defaultConfig[key] === 'object') {
-            // Recursively fill in defaults for nested objects
-            fillDefaults(config[key], defaultConfig[key]);
+            // Recursively sync nested objects
+            syncConfig(config[key], defaultConfig[key]);
         }
     });
 }
+
 /////////////////////////  Window Handlers ////////////////////////////
 // Set config defaults
 const defaultConfig = {
@@ -1755,7 +1763,7 @@ window.onload = async () => {
             return false;
             };
         //fill in defaults - after updates add new items
-        fillDefaults(config, defaultConfig);
+        syncConfig(config, defaultConfig);
         // Reset defaults for tensorflow batchsize. If removing, update change handler for batch-size
         if (config.tensorflow.batchSizeWasReset !== true && config.tensorflow.batchSize === 32) {
             const RAM = parseInt(DIAGNOSTICS['System Memory'].replace(' GB', ''));
@@ -1983,7 +1991,7 @@ const setUpWorkerMessaging = () => {
                                     Locate File
                                 </button>
                                 <button id="purge-from-toast" class="ms-3 btn btn-danger text-nowrap" style="--bs-btn-padding-y: .25rem;" type="button">
-                                    Delete File
+                                    Remove from Archive
                                 </button>
                             </div>
                             `
@@ -2013,8 +2021,18 @@ const setUpWorkerMessaging = () => {
                     const mode = args.mode;
                     STATE.mode = mode;
                     renderFilenamePanel();
+                    switch (mode) {
+                        case 'analyse':{
+                            STATE.diskHasRecords && !PREDICTING && enableMenuItem(['explore', 'charts']);
+                            break
+                        }
+                        case 'archive':{
+                            enableMenuItem(['save2db', 'explore', 'charts']);
+                            break
+                        }
+                    }
                     config.debug && console.log("Mode changed to: " + mode);
-                    if (mode === 'archive' || mode === 'explore') {
+                    if (['archive', 'explore'].includes(mode)) {
                         enableMenuItem(['purge-file']);
                         // change header to indicate activation
                         DOM.resultHeader.classList.remove('text-bg-secondary');
@@ -2635,11 +2653,34 @@ function onChartData(args) {
         tooltip.style.visibility = 'hidden';
     };
 
+    // async function specTooltip(event) {
+    //     const waveElement = event.target;
+    //     const specDimensions = waveElement.getBoundingClientRect();
+    //     const frequencyRange = Number(config.audio.maxFrequency) - Number(config.audio.minFrequency);
+    //     const yPosition = Math.round((specDimensions.bottom - event.clientY) * (frequencyRange / specDimensions.height)) + Number(config.audio.minFrequency);
+    //     tooltip.textContent = `Frequency: ${yPosition}Hz`;
+    //     if (region) {
+    //         const lineBreak = document.createElement('br');
+    //         const textNode = document.createTextNode(formatRegionTooltip(region.start, region.end));
+            
+    //         tooltip.appendChild(lineBreak);  // Add the line break
+    //         tooltip.appendChild(textNode);   // Add the text node
+    //     }
+    //     Object.assign(tooltip.style, {
+    //         top: `${event.clientY}px`,
+    //         left: `${event.clientX + 15}px`,
+    //         display: 'block',
+    //         visibility: 'visible'
+    //     });
+    // }
+
     async function specTooltip(event) {
         const waveElement = event.target;
         const specDimensions = waveElement.getBoundingClientRect();
         const frequencyRange = Number(config.audio.maxFrequency) - Number(config.audio.minFrequency);
         const yPosition = Math.round((specDimensions.bottom - event.clientY) * (frequencyRange / specDimensions.height)) + Number(config.audio.minFrequency);
+        
+        // Update the tooltip content
         tooltip.textContent = `Frequency: ${yPosition}Hz`;
         if (region) {
             const lineBreak = document.createElement('br');
@@ -2648,15 +2689,32 @@ function onChartData(args) {
             tooltip.appendChild(lineBreak);  // Add the line break
             tooltip.appendChild(textNode);   // Add the text node
         }
+    
+        // Get the tooltip's dimensions
+        tooltip.style.display = 'block';  // Ensure tooltip is visible to measure dimensions
+        const tooltipWidth = tooltip.offsetWidth;
+        const windowWidth = window.innerWidth;
+    
+        // Calculate the new tooltip position
+        let tooltipLeft;
+        
+        // If the tooltip would overflow past the right side of the window, position it to the left
+        if (event.clientX + tooltipWidth + 15 > windowWidth) {
+            tooltipLeft = event.clientX - tooltipWidth - 5;  // Position to the left of the mouse cursor
+        } else {
+            tooltipLeft = event.clientX + 15;  // Position to the right of the mouse cursor
+        }
+    
+        // Apply styles to the tooltip
         Object.assign(tooltip.style, {
             top: `${event.clientY}px`,
-            left: `${event.clientX + 15}px`,
+            left: `${tooltipLeft}px`,
             display: 'block',
-            visibility: 'visible'
+            visibility: 'visible',
+            opacity: 1
         });
     }
 
-
     const LIST_MAP = {
         location: 'Searching for birds in your region',
         nocturnal: 'Searching for nocturnal birds',
@@ -2803,12 +2861,12 @@ function centreSpec(){
       
     const GLOBAL_ACTIONS = { // eslint-disable-line
         a: function (e) { 
-            if (( e.ctrlKey || e.metaKey) && currentFile) {
+            if (( e.ctrlKey || e.metaKey) && STATE.currentFile) {
                 const element = e.shiftKey ? 'analyseAll' : 'analyse';
                 document.getElementById(element).click();
             }
         },
-        A: function (e) { ( e.ctrlKey || e.metaKey) && currentFile && document.getElementById('analyseAll').click()},
+        A: function (e) { ( e.ctrlKey || e.metaKey) && STATE.currentFile && document.getElementById('analyseAll').click()},
         c: function (e) { 
             // Center window on playhead
             if (( e.ctrlKey || e.metaKey) && currentBuffer) {
@@ -2835,7 +2893,7 @@ function centreSpec(){
         },
         s: function (e) {
             if ( e.ctrlKey || e.metaKey) {
-                worker.postMessage({ action: 'save2db', file: currentFile});
+                worker.postMessage({ action: 'save2db', file: STATE.currentFile});
             }
         },
         t: function (e) {
@@ -2863,6 +2921,7 @@ function centreSpec(){
                     threads: config[config[config.model].backend].threads,
                     list: config.list
                 });
+                STATE.diskHasRecords && enableMenuItem(['explore', 'charts']);
                 generateToast({ message:'Operation cancelled'});
                 DOM.progressDiv.classList.add('d-none');
             }
@@ -2936,7 +2995,11 @@ function centreSpec(){
         '-': function (e) {e.metaKey || e.ctrlKey ? increaseFFT() : zoomSpec('zoomOut')},
         ' ': function () { wavesurfer && wavesurfer.playPause() },
         Tab: function (e) {
-            if (activeRow) {
+            if ((e.metaKey || e.ctrlKey) && ! PREDICTING) { // If you did this when predicting, your results would go straight to the archive
+                const modeToSet = STATE.mode === 'explore' ? 'active-analysis' : 'explore';
+                document.getElementById(modeToSet).click()
+            }
+            else if (activeRow) {
                 activeRow.classList.remove('table-active')
                 if (e.shiftKey) {
                     activeRow = activeRow.previousSibling || activeRow;
@@ -2962,7 +3025,7 @@ function centreSpec(){
     }
     
     const postBufferUpdate = ({
-        file = currentFile,
+        file = STATE.currentFile,
         begin = 0,
         position = 0,
         play = false,
@@ -2995,7 +3058,7 @@ function centreSpec(){
     // Go to position
     const goto = new bootstrap.Modal(document.getElementById('gotoModal'));
     const showGoToPosition = () => {
-        if (currentFile) {
+        if (STATE.currentFile) {
             goto.show();
         }
     }
@@ -3011,7 +3074,7 @@ function centreSpec(){
     
     
     const gotoTime = (e) => {
-        if (currentFile) {
+        if (STATE.currentFile) {
             e.preventDefault();
             let hours = 0, minutes = 0, seconds = 0;
             const time = document.getElementById('timeInput').value;
@@ -3092,7 +3155,7 @@ function centreSpec(){
         clearTimeout(loadingTimeout)
         // Clear the loading animation
         DOM.loading.classList.add('d-none');
-        const resetSpec = !currentFile;
+        const resetSpec = !STATE.currentFile;
         currentFileDuration = sourceDuration;
         //if (preserveResults) completeDiv.hide();
         console.log(`UI received worker-loaded-audio: ${file}, buffered: ${contents === undefined}`);
@@ -3110,14 +3173,14 @@ function centreSpec(){
             }
         } else {
             NEXT_BUFFER = undefined;
-            if (currentFile !== file) {
-                currentFile = file;
+            if (STATE.currentFile !== file) {
+                STATE.currentFile = file;
 
                 fileStart = start;
                 fileEnd = new Date(fileStart + (currentFileDuration * 1000));
             }
             
-            STATE.guano[currentFile] = guano;
+            STATE.guano[STATE.currentFile] = guano;
             renderFilenamePanel();
 
             if (config.timeOfDay) {
@@ -3259,9 +3322,22 @@ function centreSpec(){
         }
     }
     
+// formatDuration: Used for DIAGNOSTICS Duration
+function formatDuration(seconds){
+    let duration = '';
+    const hours = Math.floor(seconds / 3600);          // 1 hour = 3600 seconds
+    if (hours) duration += `${hours} hours `;
+    const minutes = Math.floor((seconds % 3600) / 60); // 1 minute = 60 seconds
+    if (hours || minutes) duration += `${minutes} minutes `;
+    const remainingSeconds = Math.floor(seconds % 60); // Remaining seconds
+    duration += `${remainingSeconds} seconds`;
+    return duration;
+}
+
     function onAnalysisComplete({quiet}){
         PREDICTING = false;
         STATE.analysisDone = true;
+        STATE.diskHasRecords && enableMenuItem(['explore', 'charts']);
         DOM.progressDiv.classList.add('d-none');
         if (quiet) return
         // DIAGNOSTICS:
@@ -3275,7 +3351,7 @@ function centreSpec(){
         trackEvent(config.UUID, `${config.model}-${config[config.model].backend}`, 'Analysis Rate', config[config.model].backend, parseInt(rate));
         
         if (! STATE.selection){
-            DIAGNOSTICS['Analysis Duration'] = analysisTime + ' seconds';
+            DIAGNOSTICS['Analysis Duration'] = formatDuration(analysisTime);
             DIAGNOSTICS['Analysis Rate'] = rate.toFixed(0) + 'x faster than real time performance.';
             generateToast({ message:'Analysis complete.'});
             activateResultFilters();
@@ -3301,7 +3377,7 @@ function centreSpec(){
             enableMenuItem(['saveLabels', 'saveCSV', 'save-eBird', 'save-Raven']);
             STATE.mode !== 'explore' && enableMenuItem(['save2db'])            
         }
-        if (currentFile) enableMenuItem(['analyse'])
+        if (STATE.currentFile) enableMenuItem(['analyse'])
         adjustSpecDims(true)
     }
     
@@ -3387,12 +3463,6 @@ function centreSpec(){
         resetResults({clearSummary: false, clearPagination: false, clearResults: false});
     }
     
-    
-    // const checkDayNight = (timestamp) => {
-    //     let astro = SunCalc.getTimes(timestamp, config.latitude, config.longitude);
-    //     return (astro.dawn.setMilliseconds(0) < timestamp && astro.dusk.setMilliseconds(0) > timestamp) ? 'daytime' : 'nighttime';
-    // }
-    
     // TODO: show every detection in the spec window as a region on the spectrogram
     
     async function renderResult({
@@ -3451,7 +3521,7 @@ function centreSpec(){
                 callCount,
                 isDaylight
             } = result;
-            const dayNight = isDaylight ? 'daytime' : 'nighttime'; // checkDayNight(timestamp);
+            const dayNight = isDaylight ? 'daytime' : 'nighttime'; 
             // Todo: move this logic so pre dark sections of file are not even analysed
             if (config.detect.nocmig && !selection && dayNight === 'daytime') return
             
@@ -3545,7 +3615,7 @@ function centreSpec(){
                 const [start, end] = position;
                 worker.postMessage({
                     action: 'delete',
-                    file: currentFile,
+                    file: STATE.currentFile,
                     start: start,
                     end: end,
                     active: getActiveRowID(),
@@ -3654,7 +3724,7 @@ function centreSpec(){
         if (mode === 'save') {
             worker.postMessage({
                 action: 'save',
-                start: start, file: currentFile, end: end, filename: filename, metadata: metadata
+                start: start, file: STATE.currentFile, end: end, filename: filename, metadata: metadata
             })
         } else {
             if (!config.seenThanks) {
@@ -3664,7 +3734,7 @@ function centreSpec(){
             }
             worker.postMessage({
                 action: 'post',
-                start: start, file: currentFile, end: end, defaultName: filename, metadata: metadata, mode: mode
+                start: start, file: STATE.currentFile, end: end, defaultName: filename, metadata: metadata, mode: mode
             })
         }
     }
@@ -3933,19 +4003,7 @@ function centreSpec(){
         let diagnosticTable = "<table class='table-hover table-striped p-2 w-100'>";
         for (let [key, value] of Object.entries(DIAGNOSTICS)) {
             if (key === 'Audio Duration') { // Format duration as days, hours,minutes, etc.
-                if (value < 3600) {
-                    value = new Date(value * 1000).toISOString().substring(14, 19);
-                    value = value.replace(':', ' minutes ').concat(' seconds');
-                } else if (value < 86400) {
-                    value = new Date(value * 1000).toISOString().substring(11, 19)
-                    value = value.replace(':', ' hours ').replace(':', ' minutes ').concat(' seconds')
-                } else {
-                    value = new Date(value * 1000).toISOString().substring(8, 19);
-                    const day = parseInt(value.slice(0, 2)) - 1;
-                    const daysString = day === 1 ? '1 day ' : day.toString() + ' days ';
-                    const dateString = daysString + value.slice(3);
-                    value = dateString.replace(':', ' hours ').replace(':', ' minutes ').concat(' seconds');
-                }
+                value = formatDuration(value)
             }
             diagnosticTable += `<tr><th scope="row">${key}</th><td>${value}</td></tr>`;
         }
@@ -4460,20 +4518,20 @@ DOM.gain.addEventListener('input', () => {
             
             // Records menu
             case 'save2db': { 
-                worker.postMessage({ action: 'save2db', file: currentFile }); 
+                worker.postMessage({ action: 'save2db', file: STATE.currentFile }); 
                 if (config.archive.auto) document.getElementById('compress-and-organise').click();
                 break }
             case 'charts': { showCharts(); break }
             case 'explore': { showExplore(); break }
             case 'active-analysis': { showAnalyse(); break }
             case 'compress-and-organise': {compressAndOrganise(); break}
-            case 'purge-file': { deleteFile(currentFile); break }
+            case 'purge-file': { deleteFile(STATE.currentFile); break }
 
             //Analyse menu
-            case 'analyse': {postAnalyseMessage({ filesInScope: [currentFile] }); break }
+            case 'analyse': {postAnalyseMessage({ filesInScope: [STATE.currentFile] }); break }
             case 'analyseSelection': {getSelectionResults(); break }
             case 'analyseAll': {postAnalyseMessage({ filesInScope: STATE.openFiles }); break }
-            case 'reanalyse': {postAnalyseMessage({ filesInScope: [currentFile], reanalyse: true }); break }
+            case 'reanalyse': {postAnalyseMessage({ filesInScope: [STATE.currentFile], reanalyse: true }); break }
             case 'reanalyseAll': {postAnalyseMessage({ filesInScope: STATE.openFiles, reanalyse: true }); break }
             
             case 'purge-from-toast': { deleteFile(MISSING_FILE); break }
@@ -4490,7 +4548,7 @@ DOM.gain.addEventListener('input', () => {
                 updatePrefs('config.json', config)
                 resetResults({clearSummary: true, clearPagination: true, clearResults: true});
                 setListUIState(config.list);
-                if (currentFile && STATE.analysisDone) worker.postMessage({ action: 'update-list', list: config.list, refreshResults: true })
+                if (STATE.currentFile && STATE.analysisDone) worker.postMessage({ action: 'update-list', list: config.list, refreshResults: true })
                 break;
             }
             
@@ -4500,7 +4558,7 @@ DOM.gain.addEventListener('input', () => {
             case 'settingsHelp': { (async () => await populateHelpModal('Help/settings.html', 'Settings Help'))(); break }
             case 'usage': { (async () => await populateHelpModal('Help/usage.html', 'Usage Guide'))(); break }
             case 'bugs': { (async () => await populateHelpModal('Help/bugs.html', 'Join the Chirpity Users community'))(); break }
-            case 'species': { worker.postMessage({action: 'get-valid-species', file: currentFile}); break }
+            case 'species': { worker.postMessage({action: 'get-valid-species', file: STATE.currentFile}); break }
             case 'startTour': { prepTour(); break }
             case 'eBird': { (async () => await populateHelpModal('Help/ebird.html', 'eBird Record FAQ'))(); break }
             case 'archive-location-select': {
@@ -4767,7 +4825,7 @@ DOM.gain.addEventListener('input', () => {
                     } else {
                         colorMapFieldset.classList.add('d-none')
                     }
-                    if (wavesurfer && currentFile) {
+                    if (wavesurfer && STATE.currentFile) {
                         const fftSamples = wavesurfer.spectrogram.fftSamples;
                         wavesurfer.destroy();
                         wavesurfer = undefined;
@@ -4783,7 +4841,7 @@ DOM.gain.addEventListener('input', () => {
                     const threshold = document.getElementById('color-threshold-slider').valueAsNumber;
                     document.getElementById('color-threshold').textContent = threshold;
                     config.customColormap = {'loud': loud, 'mid': mid, 'quiet': quiet, 'threshold': threshold, 'windowFn': windowFn};
-                    if (wavesurfer && currentFile) {
+                    if (wavesurfer && STATE.currentFile) {
                         const fftSamples = wavesurfer.spectrogram.fftSamples;
                         wavesurfer.destroy();
                         wavesurfer = undefined;
@@ -4802,7 +4860,7 @@ DOM.gain.addEventListener('input', () => {
                 }
                 case 'spec-labels': {
                     config.specLabels = element.checked;                    
-                    if (wavesurfer && currentFile) {
+                    if (wavesurfer && STATE.currentFile) {
                         const fftSamples = wavesurfer.spectrogram.fftSamples;
                         wavesurfer.destroy();
                         wavesurfer = undefined;
@@ -5106,7 +5164,7 @@ async function readLabels(labelFile, updating){
     
     
     const insertManualRecord = (cname, start, end, comment, count, label, action, batch, originalCname, confidence) => {
-        const files = batch ? STATE.openFiles : currentFile;
+        const files = batch ? STATE.openFiles : STATE.currentFile;
         worker.postMessage({
             action: 'insert-manual-record',
             cname: cname,
@@ -5164,7 +5222,7 @@ async function readLabels(labelFile, updating){
     function deleteFile(file) {
         // EventHandler caller 
         if (typeof file === 'object' && file instanceof Event) {
-            file = currentFile;
+            file = STATE.currentFile;
         }
         if (file) {
             if (confirm(`This will remove ${file} and all the associated detections from the database archive. Proceed?`)) {
@@ -5292,7 +5350,7 @@ async function readLabels(labelFile, updating){
     // CI functions
     const getFileLoaded = () => fileLoaded;
     const donePredicting = () => !PREDICTING;
-    const getAudacityLabels = () => AUDACITY_LABELS[currentFile];
+    const getAudacityLabels = () => AUDACITY_LABELS[STATE.currentFile];
     
     
     // Update checking for Mac 
diff --git a/js/worker.js b/js/worker.js
index 4cbd2708..3b649205 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -374,7 +374,7 @@ async function handleMessage(e) {
             let {model, batchSize, threads, backend, list} = args;
             const t0 = Date.now();
             STATE.detect.backend = backend;
-            setGetSummaryQueryInterval()
+            setGetSummaryQueryInterval(threads)
             INITIALISED = (async () => {
                 LIST_WORKER = await spawnListWorker(); // this can change the backend if tfjs-node isn't available
                 DEBUG && console.log('List worker took', Date.now() - t0, 'ms to load');
@@ -408,7 +408,7 @@ async function handleMessage(e) {
         }
         case 'change-threads': {
             const threads = e.data.threads;
-            setGetSummaryQueryInterval()
+            setGetSummaryQueryInterval(threads)
             const delta = threads - predictWorkers.length;
             NUM_WORKERS+=delta;
             if (delta > 0) {
@@ -585,7 +585,6 @@ function savedFileCheck(fileList) {
 }
 
 function setGetSummaryQueryInterval(threads){
-    STATE.detect.backend !== 'tensorflow' ? threads * 10 : threads;
     STATE.incrementor = STATE.detect.backend !== 'tensorflow' ? threads * 10 : threads;
 }
 
@@ -1078,7 +1077,14 @@ async function locateFile(file) {
             }
         }
     } catch (error) {
-        console.warn(error.message); // Expected that this happens when the directory doesn't exist
+        if (error.message.includes('scandir')){
+            const match = str.match(/'([^']+)'/);
+            UI.postMessage({
+                event: 'generate-alert', type: 'warning', 
+                message: `Unable to locate folder "${match}". Perhaps the disk was removed?`
+            })
+        }
+        console.warn(error.message + ' - Disk removed?'); // Expected that this happens when the directory doesn't exist
     } 
     return null;
 }
@@ -1284,7 +1290,6 @@ function setupCtx(audio, rate, destination, file) {
     .catch(error => aborted || console.warn(error, file));    
 };
 
-
 function checkBacklog(stream) {
     return new Promise((resolve) => {
         const backlog = sumObjectValues(predictionsRequested) - sumObjectValues(predictionsReceived);
@@ -1300,7 +1305,28 @@ function checkBacklog(stream) {
         }
     });
 }
-
+// function checkBacklog(stream) {
+//     return new Promise((resolve, reject) => {
+//         const maxRetries = 20; // Max retries before stopping, to avoid infinite loops
+//         let retryCount = 0;
+//         let checkInterval = 50; // Start with 50ms
+        
+//         const intervalId = setInterval(() => {
+//             const backlog = sumObjectValues(predictionsRequested) - sumObjectValues(predictionsReceived);
+//             DEBUG && console.log('backlog:', backlog);
+
+//             // If backlog is within limits, clear interval and resolve
+//             if (backlog < predictWorkers.length * 2 || retryCount >= maxRetries) {
+//                 clearInterval(intervalId);
+//                 resolve(stream.read());
+//             } else {
+//                 retryCount++;
+//                 // Optionally implement exponential backoff by increasing checkInterval
+//                 checkInterval = Math.min(checkInterval * 2, 1000); // Cap at 1000ms
+//             }
+//         }, checkInterval);
+//     });
+// }
 
 /**
 *
@@ -1511,7 +1537,6 @@ const getPredictBuffers = async ({
                     updateFilesBeingProcessed(file)
                 }
                 DEBUG && console.log('All chunks sent for ', file);
-                //STREAM.end();
                 resolve('finished')
             }
             else {
@@ -1527,9 +1552,9 @@ const getPredictBuffers = async ({
 
                 // if we have a full buffer
                 if (concatenatedBuffer.length > highWaterMark) {     
-                    const audio_chunk = Buffer.allocUnsafeSlow(highWaterMark);
+                    const audio_chunk = Buffer.allocUnsafe(highWaterMark);
                     concatenatedBuffer.copy(audio_chunk, 0, 0, highWaterMark);
-                    const remainder = Buffer.allocUnsafeSlow(concatenatedBuffer.length - highWaterMark);
+                    const remainder = Buffer.allocUnsafe(concatenatedBuffer.length - highWaterMark);
                     concatenatedBuffer.copy(remainder, 0, highWaterMark);
                     const noHeader = audio_chunk.compare(header, 0, header.length, 0, header.length)
                     const audio = noHeader ? joinBuffers(header, audio_chunk) : audio_chunk;
@@ -2254,7 +2279,7 @@ const parsePredictions = async (response) => {
     DEBUG && console.log('worker being used:', response.worker);
     if (! STATE.selection) await generateInsertQuery(latestResult, file).catch(error => console.warn('Error generating insert query', error));
     let [keysArray, speciesIDBatch, confidenceBatch] = latestResult;
-    if (index <= 500){
+    if (index < 499){
         const included = await getIncludedIDs(file).catch( (error) => console.log('Error getting included IDs', error));
         for (let i = 0; i < keysArray.length; i++) {
             let updateUI = false;
@@ -2318,7 +2343,9 @@ const parsePredictions = async (response) => {
         updateFilesBeingProcessed(response.file)
         DEBUG && console.log(`File ${file} processed after ${(new Date() - predictionStart) / 1000} seconds: ${filesBeingProcessed.length} files to go`);
     }
-    !STATE.selection && (STATE.increment() === 0) && getSummary({ interim: true });
+
+    !STATE.selection && (STATE.increment() === 0) && await getSummary({ interim: true });
+
     return response.worker
 }
                         
@@ -2521,12 +2548,11 @@ const getSummary = async ({
     interim = false,
     action = undefined,
 } = {}) => {
-    const db = STATE.db;
     const included = STATE.selection ? [] : await getIncludedIDs();
     const [sql, params] = prepSummaryStatement(included);
     const offset = species ? STATE.filteredOffset[species] : STATE.globalOffset;
 
-    t0 = Date.now();
+
     const summary = await STATE.db.allAsync(sql, ...params);
     const event = interim ? 'update-summary' : 'summary-complete';
     UI.postMessage({
@@ -2688,7 +2714,7 @@ const getResults = async ({
             } else {
                 species = species || '';
                 const nocmig = STATE.detect.nocmig ? '<b>nocturnal</b>' : ''
-                sendResult(++index, `No ${nocmig} ${species} detections found ${STATE.mode === 'explore' && 'in the Archive'} using the ${STATE.list} list.`, true)
+                sendResult(++index, `No ${nocmig} ${species} detections found ${STATE.mode === 'explore' ? 'in the Archive' : ''} using the ${STATE.list} list.`, true)
             }
         }
     }
diff --git a/package.json b/package.json
index d14c70ae..c73e0c26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "chirpity",
-	"version": "2.0.3",
+	"version": "2.1.0",
 	"description": "Chirpity Nocmig",
 	"main": "main.js",
 	"scripts": {

From b78ffbfcbf70e31866df436c99aec0b1fe708d4f Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Thu, 17 Oct 2024 01:30:00 +0100
Subject: [PATCH 03/15] removed batchsize reset logic fixed loading position
 Added bext metadata (initial effort) and refactored guano to metadata

---
 css/style.css  |   8 +--
 index.html     |   4 +-
 js/guano.js    | 117 ---------------------------------
 js/metadata.js | 143 ++++++++++++++++++++++++++++++++++++++++
 js/ui.js       | 133 +++++++++++++++++++-------------------
 js/worker.js   | 172 +++++++++++++++++++++++++++++++------------------
 main.js        |   1 +
 preload.js     |   5 +-
 8 files changed, 327 insertions(+), 256 deletions(-)
 delete mode 100644 js/guano.js
 create mode 100644 js/metadata.js

diff --git a/css/style.css b/css/style.css
index a19379fe..79c99e67 100644
--- a/css/style.css
+++ b/css/style.css
@@ -572,7 +572,7 @@ input[type="range"].vertical {
     }
 }
 
-#loadingOverlay {
+#loading {
     position: absolute;
     top: 20vh;
 }
@@ -768,7 +768,7 @@ input[type="range"].vertical {
     z-index: 1;
   }
 
-  .guano-popover {
+  .metadata-popover {
     --bs-popover-max-width: 500px;
     max-height: 500px;
     --bs-popover-border-color: var(--bs-primary);
@@ -779,12 +779,12 @@ input[type="range"].vertical {
     overflow: hidden;
   }
 
-  .guano {
+  .metadata {
     max-height: 450px;
     overflow-y: scroll;
   }
 
-  .guano table {
+  .metadata table {
     width: 100%;  /* Ensure the table takes full width */
     table-layout: auto;
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index fc64fddd..e755b2bb 100644
--- a/index.html
+++ b/index.html
@@ -1122,8 +1122,8 @@ <h5 class="modal-title" id="locationModalLabel">Set Location</h5>
                 </div>
                 <!-- Controls view -->
                 <div class="container-fluid p-1 text-bg-dark d-inline-flex" id="controlsWrapper" style="max-height: 50px" title="Drag to resize the Spectrogram window.">
-                    <a id="guano" class="pointer pt-2 d-none" tabindex="-1" data-bs-custom-class="guano-popover" data-bs-html="true" data-bs-toggle="popover" data-bs-trigger="focus" data-bs-title="File Metadata" id="File Metadata-circle-help" >
-                        <span class="material-symbols-outlined"  title="Display GUANO metadata">other_admission</span></a>
+                    <a id="metadata" class="pointer pt-2 d-none" tabindex="-1" data-bs-custom-class="metadata-popover" data-bs-html="true" data-bs-toggle="popover" data-bs-trigger="focus" data-bs-title="File Metadata" id="File Metadata-circle-help" >
+                        <span class="material-symbols-outlined"  title="Display File Metadata">other_admission</span></a>
                     <div id="filename" class="col-auto ps-1 overflow-visible flex-nowrap"></div>
                     <div id="unsaved-icon" class="material-symbols-outlined ms-2 me-2 text-warning pointer d-none"  tabindex="-1" data-bs-toggle="popover" data-bs-trigger="focus" data-bs-title="Unsaved Edits" id="Unsaved Edits-circle-help"  data-bs-content="There are changes to the results that haven't been saved.">warning</div>
                     <div class="col-auto btn-group bg-dark ms-2 me-2 text-nowrap" role="group">
diff --git a/js/guano.js b/js/guano.js
deleted file mode 100644
index e5f142b9..00000000
--- a/js/guano.js
+++ /dev/null
@@ -1,117 +0,0 @@
-////////// GUANO Support /////////////
-
-const fs = require('node:fs');
-
-/**
- * Extract GUANO metadata from a WAV file, without reading the entire file into memory.
- * @param {string} filePath - Path to the WAV file.
- * @returns {Promise<object|null>} - The extracted GUANO metadata or null if not found.
- */
-function extractGuanoMetadata(filePath) {
-    return new Promise((resolve, reject) => {
-        // Open the file
-        fs.open(filePath, 'r', (err, fd) => {
-            if (err) return reject(err);
-
-            const buffer = Buffer.alloc(12); // Initial buffer for RIFF header and first chunk header
-
-            // Read the RIFF header (12 bytes)
-            fs.read(fd, buffer, 0, 12, 0, (err) => {
-                if (err) return reject(err);
-
-                const chunkId = buffer.toString('utf-8', 0, 4); // Should be "RIFF"
-                const format = buffer.toString('utf-8', 8, 12); // Should be "WAVE"
-
-                if (chunkId !== 'RIFF' || format !== 'WAVE') {
-                    return reject(new Error('Invalid WAV file'));
-                }
-
-                let currentOffset = 12; // Start after the RIFF header
-
-                // Function to read the next chunk header
-                function readNextChunk() {
-                    const chunkHeaderBuffer = Buffer.alloc(8); // 8 bytes for chunk ID and size
-                    fs.read(fd, chunkHeaderBuffer, 0, 8, currentOffset, (err) => {
-                        if (err) return reject(err);
-
-                        const chunkId = chunkHeaderBuffer.toString('utf-8', 0, 4); // Chunk ID
-                        const chunkSize = chunkHeaderBuffer.readUInt32LE(4); // Chunk size
-                        if (chunkSize === 0) return resolve(null) // No GUANO found
-
-                        currentOffset += 8; // Move past the chunk header
-
-                        if (chunkId === 'guan') {
-                            // GUANO chunk found, read its content
-                            const guanoBuffer = Buffer.alloc(chunkSize);
-                            fs.read(fd, guanoBuffer, 0, chunkSize, currentOffset, (err) => {
-                                if (err) return reject(err);
-
-                                // GUANO data is UTF-8 encoded
-                                const guanoText = guanoBuffer.toString('utf-8');
-                                const guanoMetadata = _parseGuanoText(guanoText);
-                                resolve(guanoMetadata);
-
-                                fs.close(fd, () => {}); // Close the file descriptor
-                            });
-                        } else if (chunkId === 'data') {
-                            // Skip over the data chunk (just move the offset)
-                            currentOffset += chunkSize;
-                            // Handle padding if chunkSize is odd
-                            if (chunkSize % 2 !== 0) currentOffset += 1;
-                            readNextChunk(); // Continue reading after skipping the data chunk
-                        } else {
-                            // Skip over any other chunk
-                            currentOffset += chunkSize;
-                            // Handle padding if chunkSize is odd
-                            if (chunkSize % 2 !== 0) currentOffset += 1;
-                            readNextChunk(); // Continue reading
-                        }
-                    });
-                }
-
-                // Start reading chunks after the RIFF header
-                readNextChunk();
-            });
-        });
-    });
-}
-
-
-/**
- * Helper function to parse GUANO text into key-value pairs
- * @param {string} guanoText - GUANO text data
- * @returns {object} Parsed GUANO metadata
- */
-function _parseGuanoText(guanoText) {
-    const guanoMetadata = {};
-    // According to the GUANO Spec, the note field can contain escaped newline characters '\\n' 
-    // So, we'll substitute a placeholder to avoid conflicts
-    const _tempGuano = guanoText.replaceAll('\\n', '\uFFFF');
-    const lines = _tempGuano.split('\n');
-
-    lines.forEach(line => {
-        const colonIndex = line.indexOf(':');
-        if (colonIndex !== -1) {
-            const key = line.slice(0, colonIndex).trim();
-            // Replace the placeholder with '\n'
-            const value = line.slice(colonIndex + 1).trim().replaceAll('\uFFFF', '\n');
-         
-            try {
-                // Attempt to parse JSON-like values
-                if ((value.startsWith('[') && value.endsWith(']')) ||
-                    (value.startsWith('{') && value.endsWith('}'))) {
-                    guanoMetadata[key] = JSON.parse(value);
-                } else {
-                    guanoMetadata[key] = value;
-                }
-            } catch {
-                guanoMetadata[key] = value;
-            }
-        }
-    });
-
-    return guanoMetadata;
-}
-
-
-export {extractGuanoMetadata}
\ No newline at end of file
diff --git a/js/metadata.js b/js/metadata.js
new file mode 100644
index 00000000..afa8fcc5
--- /dev/null
+++ b/js/metadata.js
@@ -0,0 +1,143 @@
+////////// GUANO Support /////////////
+
+const fs = require('node:fs');
+
+/**
+ * Extract metadata from a WAV file, without reading the entire file into memory.
+ * @param {string} filePath - Path to the WAV file.
+ * @returns {Promise<object|null>} - The extracted metadata or null if not found.
+ */
+function extractWaveMetadata(filePath) {
+    let metadata = {}
+    return new Promise((resolve, reject) => {
+        // Open the file
+        fs.open(filePath, 'r', (err, fd) => {
+            if (err) return reject(err);
+
+            const buffer = Buffer.alloc(12); // Initial buffer for RIFF header and first chunk header
+
+            // Read the RIFF header (12 bytes)
+            fs.read(fd, buffer, 0, 12, 0, (err) => {
+                if (err) return reject(err);
+
+                const chunkId = buffer.toString('utf-8', 0, 4); // Should be "RIFF"
+                const format = buffer.toString('utf-8', 8, 12); // Should be "WAVE"
+
+                if (chunkId !== 'RIFF' || format !== 'WAVE') {
+                    return reject(new Error('Invalid WAV file'));
+                }
+
+                let currentOffset = 12; // Start after the RIFF header
+
+                // Function to read the next chunk header
+                function readNextChunk() {
+                    const chunkHeaderBuffer = Buffer.alloc(8); // 8 bytes for chunk ID and size
+                    fs.read(fd, chunkHeaderBuffer, 0, 8, currentOffset, (err) => {
+                        if (err) return reject(err);
+
+                        const chunkId = chunkHeaderBuffer.toString('utf-8', 0, 4); // Chunk ID
+                        const chunkSize = chunkHeaderBuffer.readUInt32LE(4); // Chunk size
+                        if (chunkSize === 0) {
+                            fs.close(fd, () => {}); // Close the file descriptor
+                            resolve(metadata) // No GUANO found
+                        }
+
+                        currentOffset += 8; // Move past the chunk header
+
+                        if (chunkId === 'guan') {
+                            // GUANO chunk found, read its content
+                            const guanoBuffer = Buffer.alloc(chunkSize);
+                            fs.read(fd, guanoBuffer, 0, chunkSize, currentOffset, (err) => {
+                                if (err) return reject(err);
+
+                                // GUANO data is UTF-8 encoded
+                                const guanoText = guanoBuffer.toString('utf-8');
+                                const guano = _parseMetadataText(guanoText);
+                                metadata['guano'] = guano;
+
+                            });
+                        } else if (chunkId === 'bext') {
+                            // GUANO chunk found, read its content
+                            const bextBuffer = Buffer.alloc(chunkSize);
+                            fs.read(fd, bextBuffer, 0, chunkSize, currentOffset, (err) => {
+                                if (err) return reject(err);
+                                const bext = {
+                                    Description: bextBuffer.toString('ascii', 0, 256).replaceAll('\\u000', ''),
+                                    Originator: bextBuffer.toString('ascii', 256, 288).replaceAll('\\u000', ''),
+                                    OriginatorReference: bextBuffer.toString('ascii', 288, 320).replaceAll('\\u000', ''),
+                                    OriginationDate: bextBuffer.toString('ascii', 320, 330).replaceAll('\\u000', ''),
+                                    OriginationTime: bextBuffer.toString('ascii', 330, 338).trim(),
+                                    TimeReferenceLow: bextBuffer.readUInt32LE(338),
+                                    TimeReferenceHigh: bextBuffer.readUInt32LE(342),
+                                    Version: bextBuffer.readUInt16LE(346),
+                                    UMID: bextBuffer.subarray(348, 380).toString('hex').trim(),
+                                    LoudnessValue: bextBuffer.readUInt16LE(380),
+                                    LoudnessRange: bextBuffer.readUInt16LE(382),
+                                    MaxTruePeakLevel: bextBuffer.readUInt16LE(384),
+                                    MaxMomentaryLoudness: bextBuffer.readUInt16LE(386),
+                                    MaxShortTermLoudness: bextBuffer.readUInt16LE(388)
+                                };
+                                // bext data is UTF-8 encoded
+                                const bextText = bextBuffer.subarray(392, chunkSize).toString('utf-8');
+                                const bextMetadata = _parseMetadataText(bextText);
+                                metadata['bext'] = {...bext, ...bextMetadata};
+                                // Strip empty or null keys
+                                for (let key in metadata['bext']) {
+                                    if (['', 0].includes(metadata.bext[key]) 
+                                        || /^0*$/.test(metadata.bext[key]) 
+                                        || /^\u0000*$/.test(metadata.bext[key])) {
+                                        delete metadata.bext[key];
+                                    }
+                                }
+                            });
+                        }
+                        if (chunkSize % 2 !== 0) currentOffset += 1;
+                        currentOffset += chunkSize
+                        readNextChunk(); // Continue reading after skipping the data chunk
+                    });
+                }
+                // Start reading chunks after the RIFF header
+                readNextChunk();
+            });
+        });
+    });
+}
+
+
+/**
+ * Helper function to parse GUANO text into key-value pairs
+ * @param {string} guanoText - GUANO text data
+ * @returns {object} Parsed GUANO metadata
+ */
+function _parseMetadataText(text) {
+    const metadata = {};
+    // According to the GUANO Spec, the note field can contain escaped newline characters '\\n' 
+    // So, we'll substitute a placeholder to avoid conflicts
+    const _tempGuano = text.replaceAll('\\n', '\uFFFF');
+    const lines = _tempGuano.split('\n');
+
+    lines.forEach(line => {
+        const colonIndex = line.indexOf(':');
+        if (colonIndex !== -1) {
+            const key = line.slice(0, colonIndex).trim();
+            // Replace the placeholder with '\n'
+            const value = line.slice(colonIndex + 1).trim().replaceAll('\uFFFF', '\n');
+         
+            try {
+                // Attempt to parse JSON-like values
+                if ((value.startsWith('[') && value.endsWith(']')) ||
+                    (value.startsWith('{') && value.endsWith('}'))) {
+                    metadata[key] = JSON.parse(value);
+                } else {
+                    metadata[key] = value;
+                }
+            } catch {
+                metadata[key] = value;
+            }
+        }
+    });
+
+    return metadata;
+}
+
+export {extractWaveMetadata}
\ No newline at end of file
diff --git a/js/ui.js b/js/ui.js
index 45ec357d..16545d81 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -54,7 +54,7 @@ window.addEventListener('rejectionhandled', function(event) {
 });
 
 let STATE = {
-    guano: {},
+    metadata: {},
     mode: 'analyse',
     analysisDone: false,
     openFiles: [],
@@ -70,7 +70,7 @@ let STATE = {
     sortOrder: 'timestamp',
     birdList: { lastSelectedSpecies: undefined }, // Used to put the last selected species at the top of the all-species list
     selection: { start: undefined, end: undefined },
-    currentAnalysis: {file: null, openFiles: [],  mode: null, species: null, offset: 0, active: null}
+    currentAnalysis: {currentFile: null, openFiles: [],  mode: null, species: null, offset: 0, active: null}
 }
 
 // Batch size map for slider
@@ -231,6 +231,7 @@ const DOM = {
     get resultTable() {return document.getElementById('resultTableBody')},
     get tooltip() { return document.getElementById('tooltip')},
     get waveElement() { return document.getElementById('waveform')},
+    get summary() { return document.getElementById('summary')},
     get specElement() { return document.getElementById('spectrogram')},
     get specCanvasElement() { return document.querySelector('#spectrogram canvas')},
     get waveCanvasElement() { return document.querySelector('#waveform canvas')},
@@ -309,8 +310,7 @@ DIAGNOSTICS['System Memory'] = (os.totalmem() / (1024 ** 2 * 1000)).toFixed(0) +
 
 function resetResults({clearSummary = true, clearPagination = true, clearResults = true} = {}) {
     if (clearSummary) summaryTable.textContent = '';
-    
-    clearPagination && pagination.forEach(item => item.classList.add('d-none'));
+    if (clearPagination) pagination.forEach(item => item.classList.add('d-none'));
     resultsBuffer = DOM.resultTable.cloneNode(false)
     if (clearResults) {
         DOM.resultTable.textContent = '';
@@ -360,11 +360,16 @@ function loadAudioFile({ filePath = '', preserveResults = false }) {
 
 
 function updateSpec({ buffer, play = false, position = 0, resetSpec = false }) {
-    showElement(['spectrogramWrapper'], false);
-    wavesurfer.loadDecodedBuffer(buffer);
+    if (resetSpec || DOM.spectrogramWrapper.classList.contains('d-none')){
+        DOM.spectrogramWrapper.classList.remove('d-none');
+        wavesurfer.loadDecodedBuffer(buffer);
+        adjustSpecDims(true);
+    } else {
+        wavesurfer.loadDecodedBuffer(buffer);
+    }
     wavesurfer.seekTo(position);
     play ? wavesurfer.play() : wavesurfer.pause();
-    resetSpec && adjustSpecDims(true);
+    
 }
 
 function createTimeline() {
@@ -694,36 +699,40 @@ function extractFileNameAndFolder(path) {
  * @returns {string} - HTML string of the formatted Bootstrap table
  */
 function formatAsBootstrapTable(jsonData) {
-    let tableHtml = "<div class='guano'><table class='table table-striped table-bordered'><thead class='text-bg-light'><tr><th>Key</th><th>Value</th></tr></thead><tbody>";
-
-    // Iterate over the key-value pairs in the JSON object
-    for (const [key, value] of Object.entries(JSON.parse(jsonData))) {
-        tableHtml += '<tr>';
-        tableHtml += `<td><strong>${key}</strong></td>`;
-
-        // Check if the value is an object or array, if so, stringify it
-        if (typeof value === 'object') {
-            tableHtml += `<td>${JSON.stringify(value, null, 2)}</td>`;
-        } else {
-            tableHtml += `<td>${value}</td>`;
+    let parsedData = JSON.parse(jsonData);
+    let tableHtml = "<div class='metadata'>";
+
+    for (const [heading, keyValuePairs] of Object.entries(parsedData)) {
+        tableHtml += `<h3>${heading}</h3>`;
+        tableHtml += "<table class='table table-striped table-bordered'><thead class='text-bg-light'><tr><th>Key</th><th>Value</th></tr></thead><tbody>";
+
+        for (const [key, value] of Object.entries(keyValuePairs)) {
+            tableHtml += '<tr>';
+            tableHtml += `<td><strong>${key}</strong></td>`;
+            if (typeof value === 'object') {
+                tableHtml += `<td>${JSON.stringify(value, null, 2)}</td>`;
+            } else {
+                tableHtml += `<td>${value}</td>`;
+            }
+            tableHtml += '</tr>';
         }
 
-        tableHtml += '</tr>';
+        tableHtml += '</tbody></table>';
     }
 
-    tableHtml += '</tbody></table></div>';
-    return tableHtml;
+    tableHtml += '</div>';
+    return tableHtml
 }
-function showGUANO(){
-    const icon = document.getElementById('guano');
-    if (STATE.guano[STATE.currentFile]){
+function showMetadata(){
+    const icon = document.getElementById('metadata');
+    if (STATE.metadata[STATE.currentFile]){
         icon.classList.remove('d-none');
         icon.setAttribute('data-bs-content', 'New content for the popover');
         // Reinitialize the popover to reflect the updated content
         const popover = bootstrap.Popover.getInstance(icon);
         popover.setContent({
-            '.popover-header': 'GUANO Metadata',
-            '.popover-body': formatAsBootstrapTable(STATE.guano[STATE.currentFile])
+            '.popover-header': 'Metadata',
+            '.popover-body': formatAsBootstrapTable(STATE.metadata[STATE.currentFile])
           });
     } else {
         icon.classList.add('d-none');
@@ -734,7 +743,7 @@ function renderFilenamePanel() {
     if (!STATE.currentFile) return;
     const openfile = STATE.currentFile;
     const files = STATE.openFiles;
-    showGUANO();
+    showMetadata();
     let filenameElement = DOM.filename;
     filenameElement.innerHTML = '';
     //let label = openfile.replace(/^.*[\\\/]/, "");
@@ -1265,7 +1274,7 @@ async function exportData(format, species, limit, duration){
 
 
 const handleLocationFilterChange = (e) => {
-    const location = e.target.value || undefined;
+    const location = parseInt(e.target.value) || undefined;
     worker.postMessage({ action: 'update-state', locationID: location });
     // Update the seen species list
     worker.postMessage({ action: 'get-detected-species-list' })
@@ -1275,10 +1284,10 @@ const handleLocationFilterChange = (e) => {
 
 function saveAnalyseState() {
     if (['analyse', 'archive'].includes(STATE.mode)){
-        const active = activeRow?.rowIndex -1
+        const active = activeRow?.rowIndex -1 || null
         // Store a reference to the current file
         STATE.currentAnalysis = {
-            file: STATE.currentFile, 
+            currentFile: STATE.currentFile, 
             openFiles: STATE.openFiles,  
             mode: STATE.mode,
             species: isSpeciesViewFiltered(true),
@@ -1334,11 +1343,16 @@ async function showAnalyse() {
     if (STATE.currentFile) {
         showElement(['spectrogramWrapper'], false);
         worker.postMessage({ action: 'update-state', filesToAnalyse: STATE.openFiles, sortOrder: STATE.sortOrder});
-        STATE.analysisDone && worker.postMessage({ action: 'filter', 
-            species: STATE.species, 
-            offset: STATE.offset, 
-            active: STATE.active, 
-            updateSummary: true });
+        if (STATE.analysisDone) {
+            worker.postMessage({ action: 'filter', 
+                species: STATE.species, 
+                offset: STATE.offset, 
+                active: STATE.active, 
+                updateSummary: true });
+        } else {
+            clearActive();
+            loadAudioFile({filePath: STATE.currentFile});
+        }
     }
     resetResults();
 };
@@ -1764,19 +1778,6 @@ window.onload = async () => {
             };
         //fill in defaults - after updates add new items
         syncConfig(config, defaultConfig);
-        // Reset defaults for tensorflow batchsize. If removing, update change handler for batch-size
-        if (config.tensorflow.batchSizeWasReset !== true && config.tensorflow.batchSize === 32) {
-            const RAM = parseInt(DIAGNOSTICS['System Memory'].replace(' GB', ''));
-            if (!RAM || RAM < 16){
-                config.tensorflow.batchSize = 8;
-                generateToast({message: `The new default CPU backend batch size of 8 has been applied. 
-                    This should result in faster prediction due to lower memory requirements. 
-                    Batch size can still be changed in settings`, autohide: false})
-            }
-            config.tensorflow.batchSizeWasReset = true;
-            updatePrefs('config.json', config)
-        }
-
         // set version
         config.VERSION = VERSION;
         // switch off debug mode we don't want this to be remembered
@@ -1987,10 +1988,10 @@ const setUpWorkerMessaging = () => {
                         MISSING_FILE = args.file;
                         args.message += `
                             <div class="d-flex justify-content-center mt-2">
-                                <button id="locate-missing-file" class="btn btn-secondary border-dark text-nowrap" style="--bs-btn-padding-y: .25rem;" type="button">
+                                <button id="locate-missing-file" class="btn btn-primary border-dark text-nowrap" style="--bs-btn-padding-y: .25rem;" type="button">
                                     Locate File
                                 </button>
-                                <button id="purge-from-toast" class="ms-3 btn btn-danger text-nowrap" style="--bs-btn-padding-y: .25rem;" type="button">
+                                <button id="purge-from-toast" class="ms-3 btn btn-warning text-nowrap" style="--bs-btn-padding-y: .25rem;" type="button">
                                     Remove from Archive
                                 </button>
                             </div>
@@ -3149,7 +3150,7 @@ function centreSpec(){
         play = false,
         queued = false,
         goToRegion = true,
-        guano = undefined
+        metadata = undefined
     }) {
         fileLoaded = true, locationID = location;
         clearTimeout(loadingTimeout)
@@ -3180,7 +3181,7 @@ function centreSpec(){
                 fileEnd = new Date(fileStart + (currentFileDuration * 1000));
             }
             
-            STATE.guano[STATE.currentFile] = guano;
+            STATE.metadata[STATE.currentFile] = metadata;
             renderFilenamePanel();
 
             if (config.timeOfDay) {
@@ -3378,6 +3379,7 @@ function formatDuration(seconds){
             STATE.mode !== 'explore' && enableMenuItem(['save2db'])            
         }
         if (STATE.currentFile) enableMenuItem(['analyse'])
+        
         adjustSpecDims(true)
     }
     
@@ -3435,8 +3437,6 @@ function formatDuration(seconds){
         })
     }
     
-    const summary = document.getElementById('summary');
-    // summary.addEventListener('click', speciesFilter);
     
     function speciesFilter(e) {
         if (PREDICTING || ['TBODY', 'TH', 'DIV'].includes(e.target.tagName)) return; // on Drag or clicked header
@@ -3447,7 +3447,7 @@ function formatDuration(seconds){
             e.target.closest('tr').classList.remove('text-warning');
         } else {
             //Clear any highlighted rows
-            const tableRows = summary.querySelectorAll('tr');
+            const tableRows = DOM.summary.querySelectorAll('tr');
             tableRows.forEach(row => row.classList.remove('text-warning'))
             // Add a highlight to the current row
             e.target.closest('tr').classList.add('text-warning');
@@ -3459,7 +3459,7 @@ function formatDuration(seconds){
             const list = document.getElementById('bird-list-seen');
             list.value = species || '';
         }
-        filterResults()
+        filterResults({updateSummary: false})
         resetResults({clearSummary: false, clearPagination: false, clearResults: false});
     }
     
@@ -3699,25 +3699,25 @@ function formatDuration(seconds){
             const dateString = dateArray.slice(0, 5).join(' ');
             filename = dateString + '.' + config.audio.format;
         }
-        
+
         let metadata = {
-            lat: config.latitude,
-            lon: config.longitude,
+            lat: parseFloat(config.latitude),
+            lon: parseFloat(config.longitude),
             Artist: 'Chirpity',
-            date: new Date().getFullYear(),
             version: VERSION
         };
         if (result) {
+            const date = new Date(result.timestamp);
             metadata = {
                 ...metadata,
                 UUID: config.UUID,
                 start: start,
                 end: end,
-                filename: result.filename,
+                //filename: result.file,
                 cname: result.cname,
                 sname: result.sname,
-                score: result.score,
-                date: result.date
+                score: parseInt(result.score),
+                Year: date.getFullYear()
             };
         }
         
@@ -4037,7 +4037,7 @@ function formatDuration(seconds){
             }
         });
         // Add pointer icon to species summaries
-        const summarySpecies = document.getElementById('summary').querySelectorAll('.cname');
+        const summarySpecies = DOM.summary.querySelectorAll('.cname');
         summarySpecies.forEach(row => row.classList.add('pointer'))
         // change results header to indicate activation
         DOM.resultHeader.classList.remove('text-bg-secondary');
@@ -4808,9 +4808,6 @@ DOM.gain.addEventListener('input', () => {
                     } else {
                         DOM.batchSizeValue.textContent = BATCH_SIZE_LIST[DOM.batchSizeSlider.value].toString();
                         config[config[config.model].backend].batchSize = BATCH_SIZE_LIST[element.value];
-                        // Need this in case a non-default batchsize was set, and then changed to 32
-                        if (config[config.model].backend === 'tensorflow') config.tensorflow.batchSizeWasReset = true;
-
                         worker.postMessage({action: 'change-batch-size', batchSize: BATCH_SIZE_LIST[element.value]})
                         // Reset region maxLength
                         initRegion();
diff --git a/js/worker.js b/js/worker.js
index 3b649205..b229d285 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -14,6 +14,7 @@ const merge = require('lodash.merge');
 import { State } from './state.js';
 import { sqlite3 } from './database.js';
 import {trackEvent} from './tracking.js';
+import {extractWaveMetadata} from './metadata.js';
 
 const DEBUG = true;
 
@@ -117,7 +118,60 @@ let diskDB, memoryDB;
 
 let t0; // Application profiler
 
+const setupFfmpegCommand = ({ 
+    file, 
+    start = 0, 
+    end = undefined, 
+    sampleRate = 24000, 
+    channels = 1, 
+    format = 'wav', 
+    additionalFilters = [],
+    metadata = {},
+    audioCodec = null,
+    audioBitrate = null,
+    outputOptions = []
+}) => {
+    const command = ffmpeg('file:' + file)
+        .seekInput(start)
+        .duration(end - start)
+        .format(format)
+        .audioChannels(channels)
+        .audioFrequency(sampleRate);
+
+    if (metadata.length) command.addOutputOptions(metadata);
+    // Add filters if provided
+    additionalFilters.forEach(filter => {
+        command.audioFilters(filter);
+    });
+    if (format === 'flac') command.audioFormat('s16')
+
+    if (format !== 'flac' && Object.keys(metadata).length > 0) { 
+        metadata = Object.entries(metadata).flatMap(([k, v]) => {
+            if (typeof v === 'string') {
+                // Escape special characters, including quotes and apostrophes
+                v=v.replaceAll(' ', '_');
+            };
+            return ['-metadata', `${k}=${v}`]
+        });
+        command.addOutputOptions(metadata)
+    } 
+
+    // Set codec if provided
+    if (audioCodec) command.audioCodec(audioCodec);
+
+    // Set bitRate if provided
+    if (audioBitrate) command.audioBitrate(audioBitrate);
 
+    // Add any additional output options
+    if (outputOptions.length) command.addOutputOptions(...outputOptions);
+
+    if (DEBUG){
+        command.on('start', function (commandLine) {
+            console.log('FFmpeg command: ' + commandLine);
+        })
+    }
+    return command;
+};
 
 
 const getSelectionRange = (file, start, end) => {
@@ -1078,7 +1132,7 @@ async function locateFile(file) {
         }
     } catch (error) {
         if (error.message.includes('scandir')){
-            const match = str.match(/'([^']+)'/);
+            const match = error.message.match(/'([^']+)'/);
             UI.postMessage({
                 event: 'generate-alert', type: 'warning', 
                 message: `Unable to locate folder "${match}". Perhaps the disk was removed?`
@@ -1131,7 +1185,7 @@ async function loadAudioFile({
                 play: play,
                 queued: queued,
                 goToRegion,
-                guano: METADATA[file].guano
+                metadata: METADATA[file].metadata
             }, [audioArray.buffer]);
         })
         .catch( (error) => {
@@ -1184,12 +1238,10 @@ const setMetadata = async ({ file, source_file = file }) => {
             throw new Error('Unable to determine file duration ', e);
         }
         if (file.toLowerCase().endsWith('wav')){
-            const {extractGuanoMetadata} = await import('./guano.js').catch(error => {
-                console.warn('Error loading guano.js', error)}
-            );
             const t0 = Date.now();
-            const guano = await extractGuanoMetadata(file).catch(error => console.warn("Error extracting GUANO", error));
-            if (guano){
+            const wavMetadata = await extractWaveMetadata(file).catch(error => console.warn("Error extracting GUANO", error));
+            if (Object.keys(wavMetadata).includes('guano')){
+                const guano = wavMetadata.guano;
                 const location = guano['Loc Position'];
                 if (location){
                     const [lat, lon] = location.split(' ');
@@ -1198,7 +1250,9 @@ const setMetadata = async ({ file, source_file = file }) => {
                 }
                 guanoTimestamp = Date.parse(guano.Timestamp);
                 METADATA[file].fileStart = guanoTimestamp;
-                METADATA[file].guano = JSON.stringify(guano);
+            }
+            if (Object.keys(wavMetadata).length > 0){
+                METADATA[file].metadata = JSON.stringify(wavMetadata);
             }
             DEBUG && console.log(`GUANO search took: ${(Date.now() - t0)/1000} seconds`);
         }
@@ -1491,18 +1545,11 @@ const getPredictBuffers = async ({
     predictionsReceived[file] = 0;
     predictionsRequested[file] = 0;
     let highWaterMark =  2 * sampleRate * BATCH_SIZE * WINDOW_SIZE; 
-    
 
     let chunkStart = start * sampleRate;
     return new Promise((resolve, reject) => {
         let concatenatedBuffer = Buffer.alloc(0);
-        const command = ffmpeg('file:' + file)
-            .seekInput(start)
-            .duration(end - start)
-            .format('wav')
-            .audioChannels(1) // Set to mono
-            .audioFrequency(sampleRate) // Set sample rate 
-
+        const command = setupFfmpegCommand({file, start, end, sampleRate})
         command.on('error', (error) => {
             updateFilesBeingProcessed(file)
             if (error.message.includes('SIGKILL')) console.log('FFMPEG process shut down at user request')
@@ -1512,9 +1559,6 @@ const getPredictBuffers = async ({
             console.log('Ffmpeg error in file:\n', file, 'stderr:\n', error)
             reject(console.warn('getPredictBuffers: Error in ffmpeg extracting audio segment:', error));
         });
-        command.on('start', function (commandLine) {
-            DEBUG && console.log('FFmpeg command: ' + commandLine);
-        })
 
         const STREAM = command.pipe();
         STREAM.on('readable', () => {           
@@ -1548,25 +1592,30 @@ const getPredictBuffers = async ({
                     // Initally, the highwatermark needs to add the header length to get the correct length of audio
                     if (header) highWaterMark += header.length;
                 }
-                
 
                 // if we have a full buffer
                 if (concatenatedBuffer.length > highWaterMark) {     
-                    const audio_chunk = Buffer.allocUnsafe(highWaterMark);
-                    concatenatedBuffer.copy(audio_chunk, 0, 0, highWaterMark);
-                    const remainder = Buffer.allocUnsafe(concatenatedBuffer.length - highWaterMark);
-                    concatenatedBuffer.copy(remainder, 0, highWaterMark);
-                    const noHeader = audio_chunk.compare(header, 0, header.length, 0, header.length)
-                    const audio = noHeader ? joinBuffers(header, audio_chunk) : audio_chunk;
-                    // If we *do* have a header, we need to reset highwatermark because subsequent chunks *won't* have it
-                    if (! noHeader) {
-                        highWaterMark -= header.length;
-                        shortFile = false;
-                    }
+                    // const audio_chunk = Buffer.allocUnsafe(highWaterMark);
+                    // concatenatedBuffer.copy(audio_chunk, 0, 0, highWaterMark);
+                    // const remainder = Buffer.allocUnsafe(concatenatedBuffer.length - highWaterMark);
+
+                    // concatenatedBuffer.copy(remainder, 0, highWaterMark);
+                    // const noHeader = audio_chunk.compare(header, 0, header.length, 0, header.length)
+                    // const audio = noHeader ? joinBuffers(header, audio_chunk) : audio_chunk;
+                    // // If we *do* have a header, we need to reset highwatermark because subsequent chunks *won't* have it
+                    // if (! noHeader) {
+                    //     highWaterMark -= header.length;
+                    //     shortFile = false;
+                    // }
+                    // processPredictQueue(audio, file, end, chunkStart);
+                    // chunkStart += WINDOW_SIZE * BATCH_SIZE * sampleRate
+                    // concatenatedBuffer = remainder;
+                    const audio_chunk = concatenatedBuffer.subarray(0, highWaterMark);
+                    const remainder = concatenatedBuffer.subarray(highWaterMark);
+                    const audio = header ? Buffer.concat([header, audio_chunk]) : audio_chunk;
                     processPredictQueue(audio, file, end, chunkStart);
-                    chunkStart += WINDOW_SIZE * BATCH_SIZE * sampleRate
+                    chunkStart += WINDOW_SIZE * BATCH_SIZE * sampleRate;
                     concatenatedBuffer = remainder;
-
                 }
             }
         });
@@ -1619,34 +1668,28 @@ const fetchAudioBuffer = async ({
     // Use ffmpeg to extract the specified audio segment
     if (isNaN(start)) throw(new Error('fetchAudioBuffer: start is NaN'));
     return new Promise((resolve, reject) => {
-        let command = ffmpeg('file:' + file)
-            .seekInput(start)
-            .duration(end - start)
-            .format('wav')
-            .audioChannels(1) // Set to mono
-            .audioFrequency(24_000) // Set sample rate to 24000 Hz (always - this is for wavesurfer)
-            if (STATE.filters.active) {
-                if (STATE.filters.lowShelfAttenuation && STATE.filters.lowShelfFrequency){
-                    command.audioFilters({
-                        filter: 'lowshelf',
-                        options: `gain=${STATE.filters.lowShelfAttenuation}:f=${STATE.filters.lowShelfFrequency}`
-                    })
+        const command = setupFfmpegCommand({
+            file,
+            start,
+            end,
+            sampleRate: 24000,
+            format: 'wav',
+            channels: 1,
+            additionalFilters: [
+                STATE.filters.lowShelfAttenuation && {
+                    filter: 'lowshelf',
+                    options: `gain=${STATE.filters.lowShelfAttenuation}:f=${STATE.filters.lowShelfFrequency}`
+                },
+                STATE.filters.highPassFrequency && {
+                    filter: 'highpass',
+                    options: `f=${STATE.filters.highPassFrequency}:poles=1`
+                },
+                STATE.audio.normalise && {
+                    filter: 'loudnorm',
+                    options: "I=-16:LRA=11:TP=-1.5"
                 }
-                if (STATE.filters.highPassFrequency){
-                    command.audioFilters({
-                        filter: 'highpass',
-                        options: `f=${STATE.filters.highPassFrequency}:poles=1`
-                    })
-                }
-            }
-            if (STATE.audio.normalise){
-                command.audioFilters(
-                    {
-                        filter: 'loudnorm',
-                        options: "I=-16:LRA=11:TP=-1.5"
-                    }
-                )
-            }
+            ].filter(Boolean),
+        });
         const stream = command.pipe();
         
         command.on('error', error => {
@@ -2181,7 +2224,7 @@ const onInsertManualRecord = async ({ cname, start, end, comment, count, file, l
         // Manual records can be added off the bat, so there may be no record of the file in either db
         fileStart = METADATA[file].fileStart;
         res = await db.runAsync('INSERT OR IGNORE INTO files VALUES ( ?,?,?,?,?,? )',
-        fileID, file, METADATA[file].duration, fileStart, undefined, undefined, METADATA[file].guano);
+        fileID, file, METADATA[file].duration, fileStart, undefined, undefined, METADATA[file].metadata);
         fileID = res.lastID;
         changes = 1;
         let durationSQL = Object.entries(METADATA[file].dateDuration)
@@ -2227,8 +2270,9 @@ const generateInsertQuery = async (latestResult, file) => {
     let res = await db.getAsync('SELECT id FROM files WHERE name = ?', file);
     if (!res) {
         let id = null;
-        if (METADATA[file].guano){
-            const guano = JSON.parse(METADATA[file].guano);
+        if (METADATA[file].metadata){
+            const metadata = JSON.parse(METADATA[file].metadata);
+            const guano = metadata.guano;
             if (guano['Loc Position']){
                 const [lat, lon] = guano['Loc Position'].split(' ');
                 const place = guano['Site Name'] || guano['Loc Position'];
@@ -2241,7 +2285,7 @@ const generateInsertQuery = async (latestResult, file) => {
             }
         }
         res = await db.runAsync('INSERT OR IGNORE INTO files VALUES ( ?,?,?,?,?,?,? )',
-        undefined, file, METADATA[file].duration, METADATA[file].fileStart, id, null, METADATA[file].guano);
+        undefined, file, METADATA[file].duration, METADATA[file].fileStart, id, null, METADATA[file].metadata);
         fileID = res.lastID;
         await insertDurations(file, fileID);
     } else {
diff --git a/main.js b/main.js
index 282c026b..024e7cd4 100644
--- a/main.js
+++ b/main.js
@@ -487,6 +487,7 @@ app.whenReady().then(async () => {
     autoUpdater.checkForUpdatesAndNotify()
     // Allow multiple instances of Chirpity - experimental! This alone doesn't work:
     //app.releaseSingleInstanceLock()
+
 });
 
 
diff --git a/preload.js b/preload.js
index 529bd111..92c0e3b8 100644
--- a/preload.js
+++ b/preload.js
@@ -39,7 +39,10 @@ ipcRenderer.once('provide-worker-channel', async (event) => {
     window.postMessage('provide-worker-channel', '/', event.ports)
 })
 
-
+ipcRenderer.on('error', (event, errorMessage) => {
+    console.error('Uncaught Exception from main process:', errorMessage);
+    alert('Uncaught Exception from main process:', errorMessage)
+  });
 
 contextBridge.exposeInMainWorld('electron', {
     requestWorkerChannel: () => ipcRenderer.invoke('request-worker-channel'),

From 1c5a49c9ed12ab534a8d5d447f4ec8b8d06771db Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Thu, 17 Oct 2024 10:07:18 +0100
Subject: [PATCH 04/15] Removed broken log path settings and log cleanup on
 exit in main.js Fixed "export audio clips"

---
 js/worker.js |  2 +-
 main.js      | 43 +++++++++++++++++++------------------------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/js/worker.js b/js/worker.js
index b229d285..687ce2c6 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -2736,7 +2736,7 @@ const getResults = async ({
                     //const dateString = new Date(r.timestamp).toISOString().replace(/[TZ]/g, ' ').replace(/\.\d{3}/, '').replace(/[-:]/g, '-').trim();
                     const filename = `${r.cname}_${dateString}.${STATE.audio.format}`
                     DEBUG && console.log(`Exporting from ${r.file}, position ${r.position}, into folder ${directory}`)
-                    saveAudio(r.file, r.position, r.end, filename, metadata, directory)
+                    saveAudio(r.file, r.position, r.end, filename, {Artist: 'Chirpity'}, directory)
                     i === result.length - 1 && UI.postMessage({ event: 'generate-alert', message: `${result.length} files saved` })
                 } 
             }
diff --git a/main.js b/main.js
index 024e7cd4..c639dbc0 100644
--- a/main.js
+++ b/main.js
@@ -86,11 +86,6 @@ async function fetchReleaseNotes(version) {
 
 
 
-
-log.transports.file.resolvePathFn = () => path.join(APP_DATA, 'logs/main.log');
-log.info('App starting...');
-
-
 autoUpdater.on('checking-for-update', function () {
     logUpdateStatus('Checking for update...');
     if (process.env.PORTABLE_EXECUTABLE_DIR){
@@ -177,23 +172,23 @@ async function exitHandler(options, exitCode) {
                 }
             });
         });
-        // Remove old logs
-        const logs = path.join(app.getPath('userData'), 'logs');
-        fs.readdir(logs, (err, files) => {
-            if (err) {
-                console.error('Error reading folder:', err);
-                return;
-            }
-            files.forEach((file) => {
-                fs.unlink(path.join(logs, file), (err) => {
-                    if (err) {
-                        console.error('Error deleting file:', err);
-                    } else {
-                        console.log('Deleted file:', file);
-                    }
-                });
-            });
-        });
+        // Remove old logs - commented out as logs are rotated
+        // const logs = path.join(app.getPath('userData'), 'logs');
+        // fs.readdir(logs, (err, files) => {
+        //     if (err) {
+        //         console.error('Error reading folder:', err);
+        //         return;
+        //     }
+        //     files.forEach((file) => {
+        //         fs.unlink(path.join(logs, file), (err) => {
+        //             if (err) {
+        //                 console.error('Error deleting file:', err);
+        //             } else {
+        //                 console.log('Deleted file:', file);
+        //             }
+        //         });
+        //     });
+        // });
         // Disable debug mode here?
     } else {
         console.log('no clean')
@@ -246,7 +241,7 @@ async function windowStateKeeper(windowName) {
         windowState.isMaximized = window.isMaximized();
         try {
             await settings.set(`windowState.${windowName}`, windowState);
-        } catch (error){}
+        } catch {} // do nothing
     }
     
     function track(win) {
@@ -293,7 +288,7 @@ async function createWindow() {
     // Set icon
     mainWindow.setIcon(__dirname + '/img/icon/icon.png');
     
-    // Hide nav bar excpet in ci mode
+    // Hide nav bar except in ci mode
 
     mainWindow.setMenuBarVisibility(!!process.env.CI);
     

From e0acb25321693e7beb444ae8099ba6b931454d00 Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Thu, 17 Oct 2024 14:00:34 +0100
Subject: [PATCH 05/15] refactored saving clips to overcome flac issues. Don't
 check for updates using autoUpdater on macs.

---
 js/ui.js     |  28 ++++----
 js/worker.js | 161 +++++++++++++++++----------------------------
 main.js      | 181 +++++++++++++++++++++++++++++----------------------
 3 files changed, 178 insertions(+), 192 deletions(-)

diff --git a/js/ui.js b/js/ui.js
index 16545d81..e8b22bd9 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -1050,7 +1050,10 @@ async function onOpenFiles(args) {
 * @returns {Promise<void>}
 */
 async function showSaveDialog() {
-    await window.electron.saveFile({ currentFile: STATE.currentFile, labels: AUDACITY_LABELS[STATE.currentFile] });
+    await window.electron.saveFile({ 
+        currentFile: STATE.currentFile, 
+        labels: AUDACITY_LABELS[STATE.currentFile], 
+        type: 'audacity' });
 }
 
 function resetDiagnostics() {
@@ -1750,7 +1753,7 @@ let appPath, tempPath, isMac;
 window.onload = async () => {
     window.electron.requestWorkerChannel();
     isMac = await window.electron.isMac();
-    replaceCtrlWithCommand()
+    if (isMac) replaceCtrlWithCommand()
     DOM.contentWrapper.classList.add('loaded');
     
     // Load preferences and override defaults
@@ -2245,16 +2248,15 @@ document.addEventListener('change', function (e) {
 })
 
 // Save audio clip
-function onSaveAudio({file, filename}){
-    const anchor = document.createElement('a');
-    document.body.appendChild(anchor);
-    anchor.style = 'display: none';
-    const url = window.URL.createObjectURL(file);
-    anchor.href = url;
-    anchor.download = filename;
-    anchor.click();
-    window.URL.revokeObjectURL(url);
-    anchor.remove()
+async function onSaveAudio({file, filename, extension}){
+
+    await window.electron.saveFile({ 
+        file: file, 
+        filename: filename,
+        extension: extension
+    })
+
+        
 }
 
 
@@ -3794,7 +3796,6 @@ function formatDuration(seconds){
     }
     
     function replaceCtrlWithCommand() {
-        if (isMac){
             // Select all text nodes in the body of the web page
             const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT, null, false);
             const nodes = [];
@@ -3810,7 +3811,6 @@ function formatDuration(seconds){
             
             // Replace 'Ctrl' with ⌘ in title attributes of elements
             replaceTextInTitleAttributes();
-        }
     }
     
     const populateSpeciesModal = async (included, excluded) => {
diff --git a/js/worker.js b/js/worker.js
index 687ce2c6..91165467 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -92,7 +92,7 @@ const SUPPORTED_FILES = ['.wav', '.flac', '.opus', '.m4a', '.mp3', '.mpga', '.og
 
 let NUM_WORKERS;
 let workerInstance = 0;
-let appPath, BATCH_SIZE, LABELS, batchChunksToSend = {};
+let appPath, tempPath, BATCH_SIZE, LABELS, batchChunksToSend = {};
 let LIST_WORKER;
 
 const DATASET = false;
@@ -138,13 +138,10 @@ const setupFfmpegCommand = ({
         .audioChannels(channels)
         .audioFrequency(sampleRate);
 
-    if (metadata.length) command.addOutputOptions(metadata);
     // Add filters if provided
     additionalFilters.forEach(filter => {
         command.audioFilters(filter);
     });
-    if (format === 'flac') command.audioFormat('s16')
-
     if (format !== 'flac' && Object.keys(metadata).length > 0) { 
         metadata = Object.entries(metadata).flatMap(([k, v]) => {
             if (typeof v === 'string') {
@@ -594,7 +591,7 @@ async function handleMessage(e) {
             break;
         }
         case "update-state": {
-            appPath = args.path || appPath;
+            appPath = args.path || appPath; tempPath = args.temp || tempPath;
             // If we change the speciesThreshold, we need to invalidate any location caches
             if (args.speciesThreshold) {
                 if (STATE.included?.['birdnet']?.['location'])  STATE.included.birdnet.location = {};
@@ -1944,51 +1941,26 @@ async function uploadOpus({ file, start, end, defaultName, metadata, mode }) {
 }
             
 const bufferToAudio = async ({
-    file = '', start = 0, end = 3, meta = {}, format = undefined
+    file = '', start = 0, end = 3, meta = {}, format = undefined, folder = undefined, filename = undefined
 }) => {
     if (! fs.existsSync(file)) {
         const found = await getWorkingFile(file);
         if (!found) return
     }
-    let audioCodec, mimeType, soundFormat;
     let padding = STATE.audio.padding;
     let fade = STATE.audio.fade;
     let bitrate = STATE.audio.bitrate;
     let quality = parseInt(STATE.audio.quality);
     let downmix = STATE.audio.downmix;
     format ??= STATE.audio.format;
-    const bitrateMap = { 24_000: '24k', 16_000: '16k', 12_000: '12k', 8000: '8k', 44_100: '44k', 22_050: '22k', 11_025: '11k' };
-    if (format === 'mp3') {
-        audioCodec = 'libmp3lame';
-        soundFormat = 'mp3';
-        mimeType = 'audio/mpeg'
-    } else if (format === 'wav') {
-        audioCodec = 'pcm_s16le';
-        soundFormat = 'wav';
-        mimeType = 'audio/wav'
-    } else if (format === 'flac') {
-        audioCodec = 'flac';
-        soundFormat = 'flac';
-        mimeType = 'audio/flac'
-        // Static binary is missing the aac encoder
-        // } else if (format === 'm4a') {
-        //     audioCodec = 'aac';
-        //     soundFormat = 'aac';
-        //     mimeType = 'audio/mp4'
-    } else if (format === 'opus') {
-        audioCodec = 'libopus';
-        soundFormat = 'opus'
-        mimeType = 'audio/ogg'
-    }
+    const formatMap = {
+        mp3: { audioCodec: 'libmp3lame', soundFormat: 'mp3' },
+        wav: { audioCodec: 'pcm_s16le', soundFormat: 'wav' },
+        flac: { audioCodec: 'flac', soundFormat: 'flac' },
+        opus: { audioCodec: 'libopus', soundFormat: 'opus' }
+    };
+    const { audioCodec, soundFormat } = formatMap[format] || {};
     
-    let optionList = [];
-    for (let [k, v] of Object.entries(meta)) {
-        if (typeof v === 'string') {
-            v = v.replaceAll(' ', '_');
-        }
-        optionList.push('-metadata');
-        optionList.push(`${k}=${v}`);
-    }
     METADATA[file] || await getWorkingFile(file);
     if (padding) {
         start -= padding;
@@ -1998,53 +1970,46 @@ const bufferToAudio = async ({
     }
     
     return new Promise(function (resolve, reject) {
-        const bufferStream = new PassThrough();
-        let ffmpgCommand = ffmpeg('file:' + file)
+        let command = ffmpeg('file:' + file)
         .toFormat(soundFormat)
-        .seekInput(start)
-        .duration(end - start)
         .audioChannels(downmix ? 1 : -1)
         // I can't get this to work with Opus
         // .audioFrequency(METADATA[file].sampleRate)
-        .audioCodec(audioCodec)
-        .addOutputOptions(...optionList)
-        
+        .audioCodec(audioCodec).seekInput(start).duration(end - start)
         if (['mp3', 'm4a', 'opus'].includes(format)) {
             //if (format === 'opus') bitrate *= 1000;
-            ffmpgCommand = ffmpgCommand.audioBitrate(bitrate)
+            command = command.audioBitrate(bitrate)
         } else if (['flac'].includes(format)) {
-            ffmpgCommand = ffmpgCommand.audioQuality(quality)
+            command = command.audioQuality(quality)
         }
         if (STATE.filters.active) {
-            if (STATE.filters.lowShelfFrequency > 0){
-                ffmpgCommand = ffmpgCommand.audioFilters(
-                    {
-                        filter: 'lowshelf',
-                        options: `gain=${STATE.filters.lowShelfAttenuation}:f=${STATE.filters.lowShelfFrequency}`
-                    }
-                )
-            }
-            if (STATE.filters.highPassFrequency > 0){
-                ffmpgCommand = ffmpgCommand.audioFilters(
-                    {
-                        filter: 'highpass',
-                        options: `f=${STATE.filters.highPassFrequency}:poles=1`
-                    }
-                )
-            }
-            if (STATE.audio.normalise){
-                ffmpgCommand = ffmpgCommand.audioFilters(
-                    {
-                        filter: 'loudnorm',
-                        options: "I=-16:LRA=11:TP=-1.5" //:offset=" + STATE.audio.gain
-                    }
-                )
+            const filters = [];
+            if (STATE.filters.lowShelfFrequency > 0) {
+                filters.push({
+                    filter: 'lowshelf',
+                    options: `gain=${STATE.filters.lowShelfAttenuation}:f=${STATE.filters.lowShelfFrequency}`
+                });
             }
+            if (STATE.filters.highPassFrequency > 0) {
+                filters.push({
+                    filter: 'highpass',
+                    options: `f=${STATE.filters.highPassFrequency}:poles=1`
+                });
+            }            
+            if (STATE.audio.normalise) {
+                filters.push({
+                    filter: 'loudnorm',
+                    options: "I=-16:LRA=11:TP=-1.5"
+                });
+            }            
+            if (filters.length > 0) {
+                command = command.audioFilters(filters);
+            }            
         }
         if (fade && padding) {
             const duration = end - start;
             if (start >= 1 && end <= METADATA[file].duration - 1) {
-                ffmpgCommand = ffmpgCommand.audioFilters(
+                command = command.audioFilters(
                     {
                         filter: 'afade',
                         options: `t=in:ss=${start}:d=1`
@@ -2055,47 +2020,41 @@ const bufferToAudio = async ({
                     }
                 )}
         }
+        if (Object.entries(meta).length){
+            meta = Object.entries(meta).flatMap(([k, v]) => {
+                if (typeof v === 'string') {
+                    // Escape special characters, including quotes and apostrophes
+                    v=v.replaceAll(' ', '_');
+                };
+                return ['-metadata', `${k}=${v}`]
+            });
+            command.addOutputOptions(meta)
+        }
+        //const destination = p.join((folder || tempPath), 'file.mp3');
+        const destination = p.join((folder || tempPath), filename);
+        command.save(destination);
 
-
-        ffmpgCommand.on('start', function (commandLine) {
+        command.on('start', function (commandLine) {
             DEBUG && console.log('FFmpeg command: ' + commandLine);
         })
-        ffmpgCommand.on('error', (err) => {
+        command.on('error', (err) => {
             console.log('An error occurred: ' + err.message);
         })
-        ffmpgCommand.on('end', function () {
+        command.on('end', function () {
             DEBUG && console.log(format + " file rendered")
+            resolve(destination)
         })
-        ffmpgCommand.writeToStream(bufferStream);
-        
-        let concatenatedBuffer = Buffer.alloc(0);
-        bufferStream.on('readable', () => {
-            const chunk = bufferStream.read();
-            if (chunk === null){
-                let audio = [];
-                audio.push(new Int8Array(concatenatedBuffer))
-                const blob = new Blob(audio, { type: mimeType });
-                resolve(blob);    
-            } else {
-                concatenatedBuffer = concatenatedBuffer.length ?  joinBuffers(concatenatedBuffer, chunk) : chunk;
-            }
-        });
     })
 };
                 
 async function saveAudio(file, start, end, filename, metadata, folder) {
-    const thisBlob = await bufferToAudio({
-        file: file, start: start, end: end, meta: metadata
+    filename = filename.replaceAll(':', '-');
+    const convertedFilePath = await bufferToAudio({
+        file: file, start: start, end: end, meta: metadata, folder: folder, filename: filename
     });
-    if (folder) {
-        const buffer = Buffer.from(await thisBlob.arrayBuffer());
-        if (! fs.existsSync(folder)) fs.mkdirSync(folder, {recursive: true});
-        fs.writeFile(p.join(folder, filename), buffer, {flag: 'w'}, err => {
-            if (err) console.log(err) ;
-            else if (DEBUG) console.log('Audio file saved') });
-    }
+    if (folder && DEBUG) { console.log('Audio file saved: ', convertedFilePath) }
     else {
-        UI.postMessage({event:'audio-file-to-save', file: thisBlob, filename: filename})
+        UI.postMessage({event:'audio-file-to-save', file: convertedFilePath, filename: filename, extension: STATE.audio.format})
     }
 }
 
@@ -2273,7 +2232,7 @@ const generateInsertQuery = async (latestResult, file) => {
         if (METADATA[file].metadata){
             const metadata = JSON.parse(METADATA[file].metadata);
             const guano = metadata.guano;
-            if (guano['Loc Position']){
+            if (guano && guano['Loc Position']){
                 const [lat, lon] = guano['Loc Position'].split(' ');
                 const place = guano['Site Name'] || guano['Loc Position'];
                 const row = await db.getAsync('SELECT id FROM locations WHERE lat = ? AND lon = ?', parseFloat(lat), parseFloat(lon))
@@ -2388,7 +2347,7 @@ const parsePredictions = async (response) => {
         DEBUG && console.log(`File ${file} processed after ${(new Date() - predictionStart) / 1000} seconds: ${filesBeingProcessed.length} files to go`);
     }
 
-    !STATE.selection && (STATE.increment() === 0) && await getSummary({ interim: true });
+    !STATE.selection && (STATE.increment() === 0 || index === 1 ) && await getSummary({ interim: true });
 
     return response.worker
 }
diff --git a/main.js b/main.js
index c639dbc0..a9632a62 100644
--- a/main.js
+++ b/main.js
@@ -85,70 +85,70 @@ async function fetchReleaseNotes(version) {
 }
 
 
+if (! isMac){  // The auto updater doesn't work for .pkg installers
+    autoUpdater.on('checking-for-update', function () {
+        logUpdateStatus('Checking for update...');
+        if (process.env.PORTABLE_EXECUTABLE_DIR){
+            logUpdateStatus('This is a portable exe')
+        } 
+    });
 
-autoUpdater.on('checking-for-update', function () {
-    logUpdateStatus('Checking for update...');
-    if (process.env.PORTABLE_EXECUTABLE_DIR){
-        logUpdateStatus('This is a portable exe')
-    } 
-});
+    autoUpdater.on('update-available', async function (info) {
+        if (!process.env.PORTABLE_EXECUTABLE_DIR){
+            autoUpdater.downloadUpdate();
+        } else {
+            
+            // Fetch release notes from GitHub API
+            const releaseNotes = await fetchReleaseNotes(info.version);
+            dialog.showMessageBox({
+                type: 'info',
+                title: 'Update Available',
+                message: `A new version (${info.version}) is available.\n\nRelease Notes:\n${releaseNotes}`,
+                buttons: ['OK'],
+                defaultId: 1,
+                noLink: true
+            })
+        }
+    });
 
-autoUpdater.on('update-available', async function (info) {
-    if (!process.env.PORTABLE_EXECUTABLE_DIR){
-        autoUpdater.downloadUpdate();
-    } else {
-        
+    autoUpdater.on('update-not-available', function (info) {
+        logUpdateStatus('Update not available.');
+    });
+
+    autoUpdater.on('error', function (err) {
+        logUpdateStatus('Error in auto-updater:' + err);
+    });
+
+    autoUpdater.on('download-progress', function (progressObj) {
+        mainWindow.webContents.send('download-progress', progressObj);
+    });
+
+
+    autoUpdater.on('update-downloaded', async function (info) {
         // Fetch release notes from GitHub API
         const releaseNotes = await fetchReleaseNotes(info.version);
+        log.info(JSON.stringify(info))
+        // Display dialog to the user with release notes
         dialog.showMessageBox({
             type: 'info',
             title: 'Update Available',
-            message: `A new version (${info.version}) is available.\n\nRelease Notes:\n${releaseNotes}`,
-            buttons: ['OK'],
+            message: `A new version (${info.version}) is available.\n\nRelease Notes:\n${releaseNotes}\n\nDo you want to install it now?`,
+            buttons: ['Quit and Install', 'Install after Exit'],
             defaultId: 1,
             noLink: true
-        })
-    }
-});
-
-autoUpdater.on('update-not-available', function (info) {
-    logUpdateStatus('Update not available.');
-});
-
-autoUpdater.on('error', function (err) {
-    logUpdateStatus('Error in auto-updater:' + err);
-});
-
-autoUpdater.on('download-progress', function (progressObj) {
-    mainWindow.webContents.send('download-progress', progressObj);
-});
-
-
-autoUpdater.on('update-downloaded', async function (info) {
-    // Fetch release notes from GitHub API
-    const releaseNotes = await fetchReleaseNotes(info.version);
-    log.info(JSON.stringify(info))
-    // Display dialog to the user with release notes
-    dialog.showMessageBox({
-        type: 'info',
-        title: 'Update Available',
-        message: `A new version (${info.version}) is available.\n\nRelease Notes:\n${releaseNotes}\n\nDo you want to install it now?`,
-        buttons: ['Quit and Install', 'Install after Exit'],
-        defaultId: 1,
-        noLink: true
-    }).then((result) => {
-        if (result.response === 0) {
-            // User clicked 'Yes', start the download
-            autoUpdater.quitAndInstall();
-        }
+        }).then((result) => {
+            if (result.response === 0) {
+                // User clicked 'Yes', start the download
+                autoUpdater.quitAndInstall();
+            }
+        });
     });
-});
 
-function logUpdateStatus(message) {
-    console.log(message);
+    function logUpdateStatus(message) {
+        console.log(message);
+    }
 }
 
-
 process.stdin.resume();//so the program will not close instantly
 
 async function exitHandler(options, exitCode) {
@@ -514,35 +514,62 @@ ipcMain.handle('unsaved-records', (_event, data) => {
 
 
 
-ipcMain.handle('saveFile', (event, arg) => {
+ipcMain.handle('saveFile', async (event, arg) => {
     // Show file dialog to select audio file
-    let currentFile = arg.currentFile.substr(0, arg.currentFile.lastIndexOf(".")) + ".txt";
-    dialog.showSaveDialog({
-        filters: [{ name: 'Text Files', extensions: ['txt'] }],
-        defaultPath: currentFile
-    }).then(file => {
-        // Stating whether dialog operation was cancelled or not.
-        //console.log(file.canceled);
-        if (!file.canceled) {
-            const AUDACITY_LABELS = arg.labels;
-            let str = "";
-            // Format results
-            for (let i = 0; i < AUDACITY_LABELS.length; i++) {
-                str += AUDACITY_LABELS[i].timestamp + "\t";
-                str += " " + AUDACITY_LABELS[i].cname;
-                // str += " " + AUDACITY_LABELS[i].sname ;
-                str += " " + (parseFloat(AUDACITY_LABELS[i].score) * 100).toFixed(0) + "%\r\n";
+    if (arg.type === 'audacity'){
+        let currentFile = arg.currentFile.substr(0, arg.currentFile.lastIndexOf(".")) + ".txt";
+        dialog.showSaveDialog({
+            filters: [{ name: 'Text Files', extensions: ['txt'] }],
+            defaultPath: currentFile
+        }).then(file => {
+            // Stating whether dialog operation was cancelled or not.
+            //console.log(file.canceled);
+            if (!file.canceled) {
+                const AUDACITY_LABELS = arg.labels;
+                let str = "";
+                // Format results
+                for (let i = 0; i < AUDACITY_LABELS.length; i++) {
+                    str += AUDACITY_LABELS[i].timestamp + "\t";
+                    str += " " + AUDACITY_LABELS[i].cname;
+                    // str += " " + AUDACITY_LABELS[i].sname ;
+                    str += " " + (parseFloat(AUDACITY_LABELS[i].score) * 100).toFixed(0) + "%\r\n";
+                }
+                fs.writeFile(file.filePath.toString(),
+                str, function (err) {
+                    if (err) throw err;
+                    console.log('Saved!');
+                });
+            }
+        }).catch(error => {
+            console.log(error)
+        });
+    } else {
+        const {file, filename, extension} = arg;
+        dialog.showSaveDialog({
+            title: 'Save File',
+            filters: [{ name: 'Audio files', extensions: [extension] }],
+            defaultPath: filename
+        }).then(saveObj => {
+            // Check if the user cancelled the operation
+            const {canceled, filePath} = saveObj;
+            if (canceled) {
+                console.log('User cancelled the save operation.');
+                fs.rmSync(file);
+                return;
             }
-            fs.writeFile(file.filePath.toString(),
-            str, function (err) {
-                if (err) throw err;
-                console.log('Saved!');
+
+            // Copy the file from temp directory to the selected save location
+            fs.rename(file, filePath, (err) => {
+                if (err) {
+                    console.error('Error saving the file:', err);
+                } else {
+                    console.log('File saved successfully to', filePath);
+                }
+                return;
             });
-        }
-    }).catch(error => {
-        console.log(error)
-    });
-    mainWindow.webContents.send('saveFile', { message: 'file saved!' });
+        })
+    }
+
 });
 
 

From fcce3b605b5d46c43900cc47b26feebce589af41 Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Thu, 17 Oct 2024 20:12:33 +0100
Subject: [PATCH 06/15] Mechanism to throttle ffmpeg during analysis

prevent backend change during analysis
don't pad select analysis for webgl in chirpity model during selection analysis
moved backend handling to global click listener
---
 js/model.js  |   2 +-
 js/state.js  |   2 +-
 js/ui.js     |  51 +++++++-----------
 js/worker.js | 148 ++++++++++++++++++++++-----------------------------
 4 files changed, 86 insertions(+), 117 deletions(-)

diff --git a/js/model.js b/js/model.js
index 915e6f8f..a7a43640 100644
--- a/js/model.js
+++ b/js/model.js
@@ -269,7 +269,7 @@ class Model {
         // const TensorBatch = this.fixUpSpecBatch(specs); // + 1 tensor
         // specs.dispose(); // - 1 tensor
         let paddedTensorBatch, maskedTensorBatch;
-        if (BACKEND === 'webgl' && TensorBatch.shape[0] < this.batchSize) {
+        if (BACKEND === 'webgl' && TensorBatch.shape[0] < this.batchSize && !this.selection) {
             // WebGL backend works best when all batches are the same size
             paddedTensorBatch = this.padBatch(TensorBatch)  // + 1 tensor
         } else if (threshold) {
diff --git a/js/state.js b/js/state.js
index c2298b62..19defb47 100644
--- a/js/state.js
+++ b/js/state.js
@@ -32,7 +32,7 @@ export class State {
             this.list = 'everything',
             this.customList = undefined,
             this.local = true,
-            this.incrementor = 10,
+            this.incrementor = 5,
             this.UUID = 0,
             this.track = true,
             this.powerSaveBlocker = false,
diff --git a/js/ui.js b/js/ui.js
index e8b22bd9..f9e0f735 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -2656,27 +2656,6 @@ function onChartData(args) {
         tooltip.style.visibility = 'hidden';
     };
 
-    // async function specTooltip(event) {
-    //     const waveElement = event.target;
-    //     const specDimensions = waveElement.getBoundingClientRect();
-    //     const frequencyRange = Number(config.audio.maxFrequency) - Number(config.audio.minFrequency);
-    //     const yPosition = Math.round((specDimensions.bottom - event.clientY) * (frequencyRange / specDimensions.height)) + Number(config.audio.minFrequency);
-    //     tooltip.textContent = `Frequency: ${yPosition}Hz`;
-    //     if (region) {
-    //         const lineBreak = document.createElement('br');
-    //         const textNode = document.createTextNode(formatRegionTooltip(region.start, region.end));
-            
-    //         tooltip.appendChild(lineBreak);  // Add the line break
-    //         tooltip.appendChild(textNode);   // Add the text node
-    //     }
-    //     Object.assign(tooltip.style, {
-    //         top: `${event.clientY}px`,
-    //         left: `${event.clientX + 15}px`,
-    //         display: 'block',
-    //         visibility: 'visible'
-    //     });
-    // }
-
     async function specTooltip(event) {
         const waveElement = event.target;
         const specDimensions = waveElement.getBoundingClientRect();
@@ -2771,8 +2750,7 @@ function onChartData(args) {
             warmup: config.warmup,
             threads: config[config[config.model].backend].threads,
             backend: config[config.model].backend
-        });
-        
+        })
     }
     
     const handleBackendChange = (backend) => {
@@ -2809,12 +2787,6 @@ function onChartData(args) {
         loadModel();
     }
     
-    const backend = document.getElementsByName('backend');
-    for (let i = 0; i < backend.length; i++) {
-        backend[i].addEventListener('click', handleBackendChange)
-    }
-    
-    
     const setTimelinePreferences = () => {
         const timestampFields = document.querySelectorAll('.timestamp');
         const timeOfDayFields = document.querySelectorAll('.timeOfDay');
@@ -4535,6 +4507,8 @@ DOM.gain.addEventListener('input', () => {
             case 'reanalyseAll': {postAnalyseMessage({ filesInScope: STATE.openFiles, reanalyse: true }); break }
             
             case 'purge-from-toast': { deleteFile(MISSING_FILE); break }
+
+            // ----
             case 'locate-missing-file': {
                 (async () => await locateFile(MISSING_FILE))(); 
                 break }
@@ -4551,9 +4525,8 @@ DOM.gain.addEventListener('input', () => {
                 if (STATE.currentFile && STATE.analysisDone) worker.postMessage({ action: 'update-list', list: config.list, refreshResults: true })
                 break;
             }
-            
-            
-
+                        
+            // Help Menu
             case 'keyboardHelp': { (async () => await populateHelpModal('Help/keyboard.html', 'Keyboard shortcuts'))(); break }
             case 'settingsHelp': { (async () => await populateHelpModal('Help/settings.html', 'Settings Help'))(); break }
             case 'usage': { (async () => await populateHelpModal('Help/usage.html', 'Usage Guide'))(); break }
@@ -4561,6 +4534,20 @@ DOM.gain.addEventListener('input', () => {
             case 'species': { worker.postMessage({action: 'get-valid-species', file: STATE.currentFile}); break }
             case 'startTour': { prepTour(); break }
             case 'eBird': { (async () => await populateHelpModal('Help/ebird.html', 'eBird Record FAQ'))(); break }
+            
+            // --- Backends
+            case 'tensorflow':
+            case 'webgl':
+            case 'webgpu':{
+                if (PREDICTING){
+                    generateToast({message: 'It is not possible to change the model backend while an analysis is underway', type:'warning'})
+                    document.getElementById(config[config.model].backend).checked = true;
+                } else {
+                    handleBackendChange(target);
+                }
+                break;
+            }
+
             case 'archive-location-select': {
                 (async () =>{
                     const files = await window.electron.selectDirectory(config.archive.location)
diff --git a/js/worker.js b/js/worker.js
index 91165467..8ca2e263 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -142,7 +142,7 @@ const setupFfmpegCommand = ({
     additionalFilters.forEach(filter => {
         command.audioFilters(filter);
     });
-    if (format !== 'flac' && Object.keys(metadata).length > 0) { 
+    if (Object.keys(metadata).length) { 
         metadata = Object.entries(metadata).flatMap(([k, v]) => {
             if (typeof v === 'string') {
                 // Escape special characters, including quotes and apostrophes
@@ -1341,7 +1341,7 @@ function setupCtx(audio, rate, destination, file) {
     .catch(error => aborted || console.warn(error, file));    
 };
 
-function checkBacklog(stream) {
+function checkBacklog() {
     return new Promise((resolve) => {
         const backlog = sumObjectValues(predictionsRequested) - sumObjectValues(predictionsReceived);
         DEBUG && console.log('backlog:', backlog);
@@ -1349,35 +1349,13 @@ function checkBacklog(stream) {
         if (backlog >= predictWorkers.length * 2) {
             // If backlog is too high, check again after a short delay
             setTimeout(() => {
-                resolve(checkBacklog(stream)); // Recursively call until backlog is within limits
+                resolve(checkBacklog()); // Recursively call until backlog is within limits
             }, 50);
         } else {
-            resolve(stream.read()); // Backlog ok, read the stream data
+            resolve(); // Backlog ok, read the stream data
         }
     });
 }
-// function checkBacklog(stream) {
-//     return new Promise((resolve, reject) => {
-//         const maxRetries = 20; // Max retries before stopping, to avoid infinite loops
-//         let retryCount = 0;
-//         let checkInterval = 50; // Start with 50ms
-        
-//         const intervalId = setInterval(() => {
-//             const backlog = sumObjectValues(predictionsRequested) - sumObjectValues(predictionsReceived);
-//             DEBUG && console.log('backlog:', backlog);
-
-//             // If backlog is within limits, clear interval and resolve
-//             if (backlog < predictWorkers.length * 2 || retryCount >= maxRetries) {
-//                 clearInterval(intervalId);
-//                 resolve(stream.read());
-//             } else {
-//                 retryCount++;
-//                 // Optionally implement exponential backoff by increasing checkInterval
-//                 checkInterval = Math.min(checkInterval * 2, 1000); // Cap at 1000ms
-//             }
-//         }, checkInterval);
-//     });
-// }
 
 /**
 *
@@ -1445,24 +1423,23 @@ const getWavePredictBuffers = async ({
     
         let chunkStart = start * sampleRate;
         // Changed on.('data') handler because of:  https://stackoverflow.com/questions/32978094/nodejs-streams-and-premature-end
-        readStream.on('readable', () => {
+        readStream.on('readable', async () => {
             if (aborted) {
                 readStream.destroy();
                 return
             }
-
-            checkBacklog(readStream).then(chunk => {
-                if (chunk === null || chunk.byteLength <= 1 ) {
-                    // EOF
-                    chunk?.byteLength && predictionsReceived[file]++;
-                    readStream.destroy();
-                } else {
-                    const audio = joinBuffers(meta.header, chunk);
-                    predictQueue.push([audio, file, end, chunkStart]);
-                    chunkStart += WINDOW_SIZE * BATCH_SIZE * sampleRate;
-                    processPredictQueue();
-                }
-            })
+            await checkBacklog();
+            const chunk = readStream.read();
+            if (chunk === null || chunk.byteLength <= 1 ) {
+                // EOF
+                chunk?.byteLength && predictionsReceived[file]++;
+                readStream.destroy();
+            } else {
+                const audio = joinBuffers(meta.header, chunk);
+                predictQueue.push([audio, file, end, chunkStart]);
+                chunkStart += WINDOW_SIZE * BATCH_SIZE * sampleRate;
+                processPredictQueue();
+            }
         })
         readStream.on('error', err => {
             console.log(`readstream error: ${err}, start: ${start}, , end: ${end}, duration: ${METADATA[file].duration}`);
@@ -1536,14 +1513,51 @@ const getPredictBuffers = async ({
     if (start > METADATA[file].duration) {
         return
     }
-    let header, shortFile = true;
+
     const MINIMUM_AUDIO_LENGTH = 0.05; // below this value doesn't generate another chunk
     batchChunksToSend[file] = Math.ceil((end - start - MINIMUM_AUDIO_LENGTH) / (BATCH_SIZE * WINDOW_SIZE));
     predictionsReceived[file] = 0;
     predictionsRequested[file] = 0;
-    let highWaterMark =  2 * sampleRate * BATCH_SIZE * WINDOW_SIZE; 
-
+    
+    const samplesInBatch = sampleRate * BATCH_SIZE * WINDOW_SIZE
+    const highWaterMark =  samplesInBatch * 2; 
+    
     let chunkStart = start * sampleRate;
+    if (STATE.detect.backend === 'tensorflow'){
+        const step = (BATCH_SIZE * WINDOW_SIZE);
+        // Throttle the ingest of transcoded audio
+        for (let i = start; i < end; i += step){
+            await checkBacklog();
+            const finish = i + step;
+            await processAudio(file, i, finish, chunkStart, highWaterMark)
+            chunkStart += samplesInBatch;
+        }
+    } else {
+        // Full gas
+        await processAudio(file, start, end, chunkStart, highWaterMark, samplesInBatch)
+    }
+}
+
+function lookForHeader(buffer){
+    //if (buffer.length < 4096) return undefined
+    try {
+        const wav = new wavefileReader.WaveFileReader();
+        wav.fromBuffer(buffer);
+        let headerEnd;
+        wav.signature.subChunks.forEach(el => {
+            if (el['chunkId'] === 'data') {
+                headerEnd = el.chunkData.start;
+            }
+        });
+        return buffer.subarray(0, headerEnd);
+    } catch (e) {
+        DEBUG && console.log(e)
+        return undefined
+    }
+}
+
+function processAudio (file, start, end, chunkStart, highWaterMark, samplesInBatch){
+    let header, shortFile = true;
     return new Promise((resolve, reject) => {
         let concatenatedBuffer = Buffer.alloc(0);
         const command = setupFfmpegCommand({file, start, end, sampleRate})
@@ -1566,19 +1580,19 @@ const getPredictBuffers = async ({
             const chunk = STREAM.read();
             if (chunk === null) {
                 //EOF: deal with part-full buffers
-                if (shortFile) highWaterMark -= header.length;
+                // if (shortFile) highWaterMark -= header.length;
                 if (concatenatedBuffer.byteLength){
                     header || console.warn('no header for ' + file)
                     let noHeader;
-                    if (concatenatedBuffer.length < header.length) noHeader = true;
-                    else noHeader = concatenatedBuffer.compare(header, 0, header.length, 0, header.length)
-                    const audio = noHeader ? joinBuffers(header, concatenatedBuffer) : concatenatedBuffer;
+                    if (concatenatedBuffer.length < header.length) {noHeader = true}
+                    else {noHeader = concatenatedBuffer.compare(header, 0, header.length, 0, header.length)} //compare returns 0 when there is a header in audio_chunk!
+                    const audio = noHeader ? Buffer.concat([header, concatenatedBuffer]) : concatenatedBuffer;
                     processPredictQueue(audio, file, end, chunkStart);
                 } else {
                     updateFilesBeingProcessed(file)
                 }
                 DEBUG && console.log('All chunks sent for ', file);
-                resolve('finished')
+                resolve()
             }
             else {
                 concatenatedBuffer = concatenatedBuffer.length ? joinBuffers(concatenatedBuffer, chunk) : chunk;
@@ -1592,26 +1606,12 @@ const getPredictBuffers = async ({
 
                 // if we have a full buffer
                 if (concatenatedBuffer.length > highWaterMark) {     
-                    // const audio_chunk = Buffer.allocUnsafe(highWaterMark);
-                    // concatenatedBuffer.copy(audio_chunk, 0, 0, highWaterMark);
-                    // const remainder = Buffer.allocUnsafe(concatenatedBuffer.length - highWaterMark);
-
-                    // concatenatedBuffer.copy(remainder, 0, highWaterMark);
-                    // const noHeader = audio_chunk.compare(header, 0, header.length, 0, header.length)
-                    // const audio = noHeader ? joinBuffers(header, audio_chunk) : audio_chunk;
-                    // // If we *do* have a header, we need to reset highwatermark because subsequent chunks *won't* have it
-                    // if (! noHeader) {
-                    //     highWaterMark -= header.length;
-                    //     shortFile = false;
-                    // }
-                    // processPredictQueue(audio, file, end, chunkStart);
-                    // chunkStart += WINDOW_SIZE * BATCH_SIZE * sampleRate
-                    // concatenatedBuffer = remainder;
                     const audio_chunk = concatenatedBuffer.subarray(0, highWaterMark);
                     const remainder = concatenatedBuffer.subarray(highWaterMark);
-                    const audio = header ? Buffer.concat([header, audio_chunk]) : audio_chunk;
+                    let noHeader = concatenatedBuffer.compare(header, 0, header.length, 0, header.length)
+                    const audio = noHeader ? Buffer.concat([header, audio_chunk]) : audio_chunk;
                     processPredictQueue(audio, file, end, chunkStart);
-                    chunkStart += WINDOW_SIZE * BATCH_SIZE * sampleRate;
+                    chunkStart += samplesInBatch;
                     concatenatedBuffer = remainder;
                 }
             }
@@ -1625,24 +1625,6 @@ const getPredictBuffers = async ({
     }).catch(error => console.log(error));
 }
 
-function lookForHeader(buffer){
-    //if (buffer.length < 4096) return undefined
-    try {
-        const wav = new wavefileReader.WaveFileReader();
-        wav.fromBuffer(buffer);
-        let headerEnd;
-        wav.signature.subChunks.forEach(el => {
-            if (el['chunkId'] === 'data') {
-                headerEnd = el.chunkData.start;
-            }
-        });
-        return buffer.subarray(0, headerEnd);
-    } catch (e) {
-        DEBUG && console.log(e)
-        return undefined
-    }
-}
-
 /**
 *  Called when file first loaded, when result clicked and when saving or sending file snippets
 * @param args

From c06bd27f64dee116bd6ecdfb9a53af112df696cb Mon Sep 17 00:00:00 2001
From: mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 00:41:44 +0100
Subject: [PATCH 07/15] fixed processing complete toast icon fixed delay for
 summary context click added keyboard styling for keyboard help adjustspecdims
 on first result, instead of summary complete

---
 Help/keyboard.html | 52 +++++++++++++++++++++++-----------------------
 js/ui.js           | 23 +++++++++++++-------
 js/worker.js       |  6 +++---
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/Help/keyboard.html b/Help/keyboard.html
index 43263587..1662d625 100644
--- a/Help/keyboard.html
+++ b/Help/keyboard.html
@@ -11,11 +11,11 @@
         <td colspan="2" class="text-center text-bg-light"><h5>File handling</h5></td>
     </tr>
     <tr>
-        <td><b>Ctrl-O</b></td>
+        <td><kbd><kbd>Ctrl</kbd>+<kbd>O</kbd></kbd></td>
         <td>Show file open dialog</td>
     </tr>
     <tr>
-        <td><b>Ctrl-S</b></td>
+        <td><kbd>Ctrl-S</kbd></td>
         <td>Save detections to the records archive.
         </td>
     </tr>
@@ -24,116 +24,116 @@
         <td colspan="2" class="text-center text-bg-light"><h5>Analysis</h5></td>
     </tr>
     <tr>
-        <td><b>Ctrl-A</b></td>
+        <td><kbd>Ctrl-A</kbd></td>
         <td>Analyse the current file.
         </td>
     </tr>
     <tr>
-        <td><b>Shift-Ctrl-A</b></td>
+        <td><kbd>Shift-Ctrl-A</kbd></td>
         <td>Analyse all open files.
         </td>
     </tr>
     <tr>
-        <td><b>Esc</b></td>
+        <td><kbd>Esc</kbd></td>
         <td>Stop analysis</td>
     </tr>
     <tr>
-        <td><b>Ctrl-Tab</b></td>
+        <td><kbd>Ctrl-Tab</kbd></td>
         <td>Toggle between exploring the archive and the latest analysis results. This allows you to compare current detections with those you've previously recorded.</td>
     </tr>
     <tr>
         <td colspan="2" class="text-center text-bg-light"><h5>Transport Controls</h5></td>
     </tr>
     <tr>
-        <td><b>SpaceBar</b></td>
+        <td><kbd>SpaceBar</kbd></td>
         <td>Toggle Play/Pause the audio</td>
     </tr>
     <tr>
-        <td><b>P</b></td>
+        <td><kbd>P</kbd></td>
         <td>Play the selected region. Only active if a region has been selected.</td>
     </tr>
     <tr>
-        <td><b>Ctrl-C</b></td>
+        <td><kbd>Ctrl-C</kbd></td>
         <td>Centre the spectrogram at the current playhead position.</td>
     </tr>
     <tr>
-        <td><b>Ctrl-G</b></td>
+        <td><kbd>Ctrl-G</kbd></td>
         <td>Go to position in file</td>
     </tr>
     <tr>
-        <td><b>Home (Fn + ArrowLeft)</b></td>
+        <td><kbd>Home (Fn + ArrowLeft)</kbd></td>
         <td>Move the playhead to the beginning of the file</td>
     </tr>
     <tr>
-        <td><b>End (Fn + ArrowLeft)</b></td>
+        <td><kbd>End (Fn + ArrowLeft)</kbd></td>
         <td>Move the playhead to the end of the file</td>
     </tr>
     <tr>
-        <td><b>PgUp (Fn + ArrowUp)</b></td>
+        <td><kbd>PgUp (Fn + ArrowUp)</kbd></td>
         <td>Move the playhead back by a screen width</td>
     </tr>
     <tr>
-        <td><b>PgDn  (Fn + ArrowDown)</b></td>
+        <td><kbd>PgDn  (Fn + ArrowDown)</kbd></td>
         <td>Move the playhead forward by a screen width</td>
     </tr>
     <tr>
-        <td><b>Left arrow (&larr;)</b></td>
+        <td><kbd>Left arrow (&larr;)</kbd></td>
         <td>Move the playhead forward. </td>
     </tr>
     <tr>
-        <td><b>Right arrow (&rarr;)</b></td>
+        <td><kbd>Right arrow (&rarr;)</kbd></td>
         <td>Move the playhead backward. </td>
     </tr>
     <tr>
-        <td><b>Tab or Down Arrow (&darr;)</b></td>
+        <td><kbd>Tab or Down Arrow (&darr;)</kbd></td>
         <td>Skip to the next detection</td>
     </tr>
     <tr>
-        <td><b>Shift Tab or Up Arrow (&uarr;)</b></td>
+        <td><kbd>Shift Tab or Up Arrow (&uarr;)</kbd></td>
         <td>Skip back to the previous detection</td>
     </tr>
     <tr>
         <td colspan="2" class="text-center text-bg-light"><h5>Spectrogram</h5></td>
     </tr>
     <tr>
-        <td><b>Plus (+) </b></td>
+        <td><kbd>Plus (+) </kbd></td>
         <td>Zoom in on the spectrogram. When zooming, Chirpity automatically adjusts the short-time Fourier transform (STFT) window size to optimize
             the spectral resolution
         </td>
     </tr>
     <tr>
-        <td><b>Minus (-)</b></td>
+        <td><kbd>Minus (-)</kbd></td>
         <td>Zoom out the spectrogram. When zooming, Chirpity automatically adjusts the STFT window size to optimize the
             spectral resolution
         </td>
     </tr>
     <tr>
-        <td><b>Ctrl Plus (+) </b></td>
+        <td><kbd>Ctrl Plus (+) </kbd></td>
         <td>Manually reduce the spectrogram window size. Adjusting the window size has the effect of sharpening / blurring the calls in the spectrogram.
         </td>
     </tr>
     <tr>
-        <td><b>Ctrl Minus (-)</b></td>
+        <td><kbd>Ctrl Minus (-)</kbd></td>
         <td>Manually increase the spectrogram window size
         </td>
     </tr>
     <tr>
-        <td><b>Ctrl-T</b></td>
+        <td><kbd>Ctrl-T</kbd></td>
         <td>Toggle between Timecode and Time of Day</td>
     </tr>
     <tr>
         <td colspan="2" class="text-center text-bg-light"><h5>Records</h5></td>
     </tr>
     <tr>
-        <td><b>Delete</b> or <b>Backspace</b></td>
+        <td><kbd>Delete</kbd> or <kbd>Backspace</kbd></td>
         <td>Delete current record</td>
     </tr>
     <tr>
-        <td><b>Ctrl-Z</b></td>
+        <td><kbd>Ctrl-Z</kbd></td>
         <td>Restore deleted record(s)</td>
     </tr>
     <tr>
-        <td><b>Ctrl-V</b></td>
+        <td><kbd>Ctrl-V</kbd></td>
         <td>Validate the current active record (confirm the detection)</td>
     </tr>
 </table>
diff --git a/js/ui.js b/js/ui.js
index f9e0f735..264e3ed9 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -3353,8 +3353,6 @@ function formatDuration(seconds){
             STATE.mode !== 'explore' && enableMenuItem(['save2db'])            
         }
         if (STATE.currentFile) enableMenuItem(['analyse'])
-        
-        adjustSpecDims(true)
     }
     
     
@@ -3454,6 +3452,7 @@ function formatDuration(seconds){
             return
         }
         if (index <= 1) {
+            adjustSpecDims(true)
             if (selection) {
                 const selectionTable = document.getElementById('selectionResultTableBody');
                 selectionTable.textContent = '';
@@ -5000,7 +4999,7 @@ async function readLabels(labelFile, updating){
         // If we haven't clicked the active row or we cleared the region, load the row we clicked
         if (resultContext || hideInSelection || hideInSummary) {
             // Lets check if the summary needs to be filtered
-            if (!(inSummary && target.closest('tr').classList.contains('text-warning'))) {
+            if (inSummary && ! target.closest('tr').classList.contains('text-warning')) {
                 target.click(); // Wait for file to load
                 await waitForFileLoad();
             }
@@ -5230,11 +5229,19 @@ async function readLabels(labelFile, updating){
     function delay(ms) {
         return new Promise(resolve => setTimeout(resolve, ms));
     }
-    
-    async function waitForFileLoad() {
-        while (!fileLoaded) {
-            await delay(100); // Wait for 100 milliseconds before checking again
-        }
+    let fileLoadRetryCount = 0
+    function waitForFileLoad() {
+        let maxRetries = 20;
+        return new Promise((resolve) =>{
+            setTimeout(() =>{
+                if (fileLoaded) resolve(fileLoadRetryCount = 0)
+                else {
+                    console.log('retries: ', ++fileLoadRetryCount)
+                    resolve(waitForFileLoad())
+                }
+            }, 100)
+            if (fileLoadRetryCount >= maxRetries) resolve(fileLoadRetryCount = 0)
+        })
     }
     
     async function waitForLocations() {
diff --git a/js/worker.js b/js/worker.js
index 8ca2e263..7149349e 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -1146,7 +1146,7 @@ async function notifyMissingFile(file) {
     const row = await diskDB.getAsync('SELECT * FROM FILES WHERE name = ?', file);
     if (row?.id) missingFile = file
     UI.postMessage({
-        event: 'generate-alert', type: 'error', 
+        event: 'generate-alert', type: 'warning', 
         message: `Unable to locate source file with any supported file extension: ${file}`,
         file: missingFile
     })
@@ -1520,7 +1520,7 @@ const getPredictBuffers = async ({
     predictionsRequested[file] = 0;
     
     const samplesInBatch = sampleRate * BATCH_SIZE * WINDOW_SIZE
-    const highWaterMark =  samplesInBatch * 2; 
+    const highWaterMark =  samplesInBatch * 2;
     
     let chunkStart = start * sampleRate;
     if (STATE.detect.backend === 'tensorflow'){
@@ -3727,7 +3727,7 @@ async function convertAndOrganiseFiles(threadLimit) {
         const attempted  = successfulConversions + failedConversions;
         // Create a summary message
         let summaryMessage;
-        let type = 'notice';
+        let type = 'info';
         
         if (attempted) {
            summaryMessage = `Processing complete: ${successfulConversions} successful, ${failedConversions} failed.`;

From 7e46e7222dcef480737ae4cef0e9924c1f797f0b Mon Sep 17 00:00:00 2001
From: mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 01:05:01 +0100
Subject: [PATCH 08/15] a better waitforfileload solution

---
 js/ui.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/js/ui.js b/js/ui.js
index 264e3ed9..9255c667 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -5230,20 +5230,21 @@ async function readLabels(labelFile, updating){
         return new Promise(resolve => setTimeout(resolve, ms));
     }
     let fileLoadRetryCount = 0
-    function waitForFileLoad() {
-        let maxRetries = 20;
-        return new Promise((resolve) =>{
-            setTimeout(() =>{
-                if (fileLoaded) resolve(fileLoadRetryCount = 0)
-                else {
-                    console.log('retries: ', ++fileLoadRetryCount)
-                    resolve(waitForFileLoad())
+    function waitForFileLoad(count) {
+        let maxRetries = 15;
+        return new Promise((resolve) => {
+            let interval = setInterval(() => {
+                if (fileLoaded || fileLoadRetryCount >= maxRetries) {
+                    clearInterval(interval); // Stop further retries
+                    resolve(fileLoadRetryCount = 0); // Resolve the promise
+                } else {
+                    console.log('retries: ', ++fileLoadRetryCount);
                 }
-            }, 100)
-            if (fileLoadRetryCount >= maxRetries) resolve(fileLoadRetryCount = 0)
-        })
+            }, 100);
+        });
     }
     
+    
     async function waitForLocations() {
         while (!LOCATIONS) {
             await delay(100); // Wait for 100 milliseconds before checking again

From 9cc21bdc0c5574c98e51b705481f2e0b2655b8a9 Mon Sep 17 00:00:00 2001
From: mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 01:46:51 +0100
Subject: [PATCH 09/15] generic waitFor(()=>something) function

---
 js/ui.js | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/js/ui.js b/js/ui.js
index 9255c667..c378e49c 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -816,7 +816,7 @@ async function generateLocationList(id) {
     const el = document.getElementById(id);
     LOCATIONS = undefined;
     worker.postMessage({ action: 'get-locations', file: STATE.currentFile });
-    await waitForLocations();
+    await waitFor(() => LOCATIONS);
     el.innerHTML = `<option value="">${defaultText}</option>`; // clear options
     LOCATIONS.forEach(loc => {
         const option = document.createElement('option')
@@ -1163,7 +1163,7 @@ async function fetchLocationAddress(lat, lon) {
             try { 
                 if (!LOCATIONS) {
                     worker.postMessage({ action: 'get-locations', file: STATE.currentFile });
-                    await waitForLocations();  // Ensure this is awaited
+                    await waitFor(() => LOCATIONS);  // Ensure this is awaited
                 }
                 const response = await fetch(`https://nominatim.openstreetmap.org/reverse?format=jsonv2&lat=${lat}&lon=${lon}&zoom=14`);
                 
@@ -1437,7 +1437,7 @@ async function resultClick(e) {
     activeRow = row;
     loadResultRegion({ file, start, end, label });
     if (e.target.classList.contains('circle')) {
-        await waitForFileLoad();
+        await waitFor(()=> fileLoaded);
         getSelectionResults(true);
     }
 }
@@ -2560,14 +2560,10 @@ function onChartData(args) {
     
     window.addEventListener('resize', function () {
         waitForFinalEvent(function () {
-            WindowResize();
-        }, 250, 'id1');
+            adjustSpecDims(true);
+        }, 100, 'id1');
     });
     
-    function WindowResize() {
-        adjustSpecDims(true);
-    }
-    
     const contextMenu = document.getElementById('context-menu')
     
     function handleKeyDownDeBounce(e) {
@@ -5001,7 +4997,7 @@ async function readLabels(labelFile, updating){
             // Lets check if the summary needs to be filtered
             if (inSummary && ! target.closest('tr').classList.contains('text-warning')) {
                 target.click(); // Wait for file to load
-                await waitForFileLoad();
+                await waitFor(() => fileLoaded);
             }
         }
         if (region === undefined && ! inSummary) return;
@@ -5225,32 +5221,23 @@ async function readLabels(labelFile, updating){
         })
     }
 
-    // Utility functions to wait for file to load
-    function delay(ms) {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
-    let fileLoadRetryCount = 0
-    function waitForFileLoad(count) {
+    // Utility functions to wait for a variable to not be falsey
+
+    let retryCount = 0
+    function waitFor(checkFn) {
         let maxRetries = 15;
         return new Promise((resolve) => {
             let interval = setInterval(() => {
-                if (fileLoaded || fileLoadRetryCount >= maxRetries) {
+                if (checkFn() || retryCount >= maxRetries) {
                     clearInterval(interval); // Stop further retries
-                    resolve(fileLoadRetryCount = 0); // Resolve the promise
+                    resolve(retryCount = 0); // Resolve the promise
                 } else {
-                    console.log('retries: ', ++fileLoadRetryCount);
+                    console.log('retries: ', ++retryCount);
                 }
             }, 100);
         });
     }
-    
-    
-    async function waitForLocations() {
-        while (!LOCATIONS) {
-            await delay(100); // Wait for 100 milliseconds before checking again
-        }
-        return;
-    }
+
     
     // TOUR functions
     const tourModal = document.getElementById('tourModal');

From 609c13d3f3a25f9a512ea2e727bb0aaf149bf1c0 Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 10:02:53 +0100
Subject: [PATCH 10/15] Added debug check for console.log in main.js fixed
 circle click not clearing PREDICTING flag

---
 js/worker.js |  2 +-
 main.js      | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/js/worker.js b/js/worker.js
index 7149349e..d8e84821 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -2703,7 +2703,7 @@ const getResults = async ({
             }
         }
     }
-    STATE.selection || UI.postMessage({event: 'database-results-complete', active: active, select: position?.start});
+    (STATE.selection && topRankin === STATE.topRankin)  || UI.postMessage({event: 'database-results-complete', active: active, select: position?.start});
 };
 
 // Function to format the CSV export
diff --git a/main.js b/main.js
index a9632a62..697c528a 100644
--- a/main.js
+++ b/main.js
@@ -166,7 +166,7 @@ async function exitHandler(options, exitCode) {
                         if (err) {
                             console.error('Error deleting file:', err);
                         } else {
-                            console.log('Deleted file:', file);
+                            DEBUG && console.log('Deleted file:', file);
                         }
                     });
                 }
@@ -184,18 +184,18 @@ async function exitHandler(options, exitCode) {
         //             if (err) {
         //                 console.error('Error deleting file:', err);
         //             } else {
-        //                 console.log('Deleted file:', file);
+        //                 DEBUG && console.log('Deleted file:', file);
         //             }
         //         });
         //     });
         // });
         // Disable debug mode here?
     } else {
-        console.log('no clean')
+        DEBUG && console.log('no clean')
         
     }
     if (exitCode || exitCode === 0) {
-        console.log(exitCode);
+        DEBUG && console.log(exitCode);
     }
     if (options.exit) {
         process.exit();
@@ -301,7 +301,7 @@ async function createWindow() {
     mainWindow.once('ready-to-show', () => {
         mainWindow.show()
     })
-    console.log("main window created");
+    DEBUG && console.log("main window created");
     // Emitted when the window is closed.
     if (process.platform !== 'darwin') {
         mainWindow.on('closed', () => {
@@ -353,7 +353,7 @@ async function createWorker() {
         workerWindow = undefined;
     });
     if (DEBUG) workerWindow.webContents.openDevTools();
-    console.log("worker created");
+    DEBUG && console.log("worker created");
 }
 
 // This method will be called when Electron has finished loading
@@ -380,7 +380,7 @@ app.whenReady().then(async () => {
         const fileContent = fs.readFileSync(filePath, 'utf8');
         const config = JSON.parse(fileContent);
         DEBUG =   process.env.CI === 'e2e' ? false : config.debug;
-        console.log('CI mode' , process.env.CI)
+        DEBUG && console.log('CI mode' , process.env.CI)
     }
     catch (error) {
         // Handle errors, for example, file not found
@@ -413,7 +413,7 @@ app.whenReady().then(async () => {
     
     app.on('open-file', (event, path) => {
         files.push(path);
-        console.log('file passed to open:', path)
+        DEBUG && console.log('file passed to open:', path)
     });
     
     ipcMain.handle('openFiles', async (_event, _method, config) => {
@@ -463,7 +463,7 @@ app.whenReady().then(async () => {
     });
     
     workerWindow.webContents.once('render-process-gone', (e, details) => {
-        console.log(details);
+        DEBUG && console.log(details);
         const dialogOpts = {
             type: 'warning',
             title: 'Crash report',
@@ -509,7 +509,6 @@ ipcMain.handle('request-worker-channel', async (_event) =>{
 
 ipcMain.handle('unsaved-records', (_event, data) => {
     unsavedRecords = data.newValue; // Update the variable with the new value
-    console.log('Unsaved records:', unsavedRecords);
 });
 
 
@@ -523,7 +522,7 @@ ipcMain.handle('saveFile', async (event, arg) => {
             defaultPath: currentFile
         }).then(file => {
             // Stating whether dialog operation was cancelled or not.
-            //console.log(file.canceled);
+            //DEBUG && console.log(file.canceled);
             if (!file.canceled) {
                 const AUDACITY_LABELS = arg.labels;
                 let str = "";
@@ -537,11 +536,11 @@ ipcMain.handle('saveFile', async (event, arg) => {
                 fs.writeFile(file.filePath.toString(),
                 str, function (err) {
                     if (err) throw err;
-                    console.log('Saved!');
+                    DEBUG && console.log('Saved!');
                 });
             }
         }).catch(error => {
-            console.log(error)
+            console.warn(error)
         });
     } else {
         const {file, filename, extension} = arg;
@@ -553,7 +552,7 @@ ipcMain.handle('saveFile', async (event, arg) => {
             // Check if the user cancelled the operation
             const {canceled, filePath} = saveObj;
             if (canceled) {
-                console.log('User cancelled the save operation.');
+                DEBUG && console.log('User cancelled the save operation.');
                 fs.rmSync(file);
                 return;
             }
@@ -563,7 +562,7 @@ ipcMain.handle('saveFile', async (event, arg) => {
                 if (err) {
                     console.error('Error saving the file:', err);
                 } else {
-                    console.log('File saved successfully to', filePath);
+                    DEBUG && console.log('File saved successfully to', filePath);
                 }
                 return;
             });
@@ -578,9 +577,9 @@ powerSaveBlocker.stop(powerSaveID);
 ipcMain.handle('powerSaveControl', (e, on) => {
     if (on){
         powerSaveID = powerSaveBlocker.start('prevent-app-suspension')
-        //console.log(powerSaveBlocker.isStarted(powerSaveID), powerSaveID)
+        //DEBUG && console.log(powerSaveBlocker.isStarted(powerSaveID), powerSaveID)
     } else {
         powerSaveBlocker.stop(powerSaveID)
-        //console.log(powerSaveBlocker.isStarted(powerSaveID), powerSaveID)
+        //DEBUG && console.log(powerSaveBlocker.isStarted(powerSaveID), powerSaveID)
     }
 })
\ No newline at end of file

From 89f15000fcde7c5677b9741896765361973ecdbc Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 10:27:52 +0100
Subject: [PATCH 11/15] call filterResults in showAnalyse remove duplicate
 logging of ffmpeg command

---
 js/ui.js     | 2 +-
 js/worker.js | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/js/ui.js b/js/ui.js
index c378e49c..2cbb17b2 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -1347,7 +1347,7 @@ async function showAnalyse() {
         showElement(['spectrogramWrapper'], false);
         worker.postMessage({ action: 'update-state', filesToAnalyse: STATE.openFiles, sortOrder: STATE.sortOrder});
         if (STATE.analysisDone) {
-            worker.postMessage({ action: 'filter', 
+            filterResults({ 
                 species: STATE.species, 
                 offset: STATE.offset, 
                 active: STATE.active, 
diff --git a/js/worker.js b/js/worker.js
index d8e84821..fc05e7e9 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -1675,9 +1675,6 @@ const fetchAudioBuffer = async ({
             UI.postMessage({event: 'generate-alert', type: 'error',  message: error})
             reject(new Error('fetchAudioBuffer: Error extracting audio segment:', error));
         });
-        command.on('start', function (commandLine) {
-            DEBUG && console.log('FFmpeg command: ' + commandLine);
-        })
 
         stream.on('readable', () => {
             const chunk = stream.read();

From 5af26486b44438c46e849d17fd3a633e3638509e Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 11:10:38 +0100
Subject: [PATCH 12/15] Maximum file check

---
 js/metadata.js |  2 +-
 js/ui.js       | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/metadata.js b/js/metadata.js
index afa8fcc5..3ec6a5df 100644
--- a/js/metadata.js
+++ b/js/metadata.js
@@ -24,7 +24,7 @@ function extractWaveMetadata(filePath) {
                 const format = buffer.toString('utf-8', 8, 12); // Should be "WAVE"
 
                 if (chunkId !== 'RIFF' || format !== 'WAVE') {
-                    return reject(new Error('Invalid WAV file'));
+                    return reject(new Error('Invalid WAV file: ', filePath));
                 }
 
                 let currentOffset = 12; // Start after the RIFF header
diff --git a/js/ui.js b/js/ui.js
index 2cbb17b2..2e69a309 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -1015,9 +1015,15 @@ async function onOpenFiles(args) {
     showElement(['spectrogramWrapper'], false);
     resetResults({clearSummary: true, clearPagination: true, clearResults: true});
     resetDiagnostics();
-    // Store the file list and Load First audio file
     STATE.openFiles = sanitisedList;
-    STATE.openFiles.length > 1 && STATE.openFiles.length < 25_000 && worker.postMessage({action: 'check-all-files-saved', files: STATE.openFiles});
+    // CHeck not more than 25k files
+    if (STATE.openFiles.length >= 25_000){
+        generateToast({message: `Chirpity limits the maximum number of open files to 25,000. Only the first 25,000 of the ${STATE.openFiles.length} attempted will be opened`})
+        STATE.openFiles.splice(25000)
+    }
+    // Store the file list and Load First audio file
+
+    STATE.openFiles.length > 1 && worker.postMessage({action: 'check-all-files-saved', files: STATE.openFiles});
 
     // Sort file by time created (the oldest first):
     if (STATE.openFiles.length > 1) {

From 3e46391f5186abd4c2a767e06a0fcb744d5ab32e Mon Sep 17 00:00:00 2001
From: mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 12:24:57 +0100
Subject: [PATCH 13/15] keyboard updates F4 and F5 to change fft confidence bar
 dynamic font

---
 Help/keyboard.html | 40 ++++++++++++++++++++--------------------
 css/style.css      | 14 +++++++-------
 js/ui.js           |  2 ++
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Help/keyboard.html b/Help/keyboard.html
index 1662d625..7b88e7b0 100644
--- a/Help/keyboard.html
+++ b/Help/keyboard.html
@@ -11,11 +11,11 @@
         <td colspan="2" class="text-center text-bg-light"><h5>File handling</h5></td>
     </tr>
     <tr>
-        <td><kbd><kbd>Ctrl</kbd>+<kbd>O</kbd></kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>O</kbd></td>
         <td>Show file open dialog</td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-S</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>S</kbd></td>
         <td>Save detections to the records archive.
         </td>
     </tr>
@@ -24,12 +24,12 @@
         <td colspan="2" class="text-center text-bg-light"><h5>Analysis</h5></td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-A</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>A</kbd></td>
         <td>Analyse the current file.
         </td>
     </tr>
     <tr>
-        <td><kbd>Shift-Ctrl-A</kbd></td>
+        <td><kbd>Shift</kbd> + <kbd>Ctrl</kbd> + <kbd>A</kbd></td>
         <td>Analyse all open files.
         </td>
     </tr>
@@ -38,7 +38,7 @@
         <td>Stop analysis</td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-Tab</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>Tab</kbd></td>
         <td>Toggle between exploring the archive and the latest analysis results. This allows you to compare current detections with those you've previously recorded.</td>
     </tr>
     <tr>
@@ -53,27 +53,27 @@
         <td>Play the selected region. Only active if a region has been selected.</td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-C</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>C</kbd></td>
         <td>Centre the spectrogram at the current playhead position.</td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-G</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>G</kbd></td>
         <td>Go to position in file</td>
     </tr>
     <tr>
-        <td><kbd>Home (Fn + ArrowLeft)</kbd></td>
+        <td><kbd>Home</kbd> or <br><kbd>Fn</kbd> + <kbd>ArrowLeft</kbd></td>
         <td>Move the playhead to the beginning of the file</td>
     </tr>
     <tr>
-        <td><kbd>End (Fn + ArrowLeft)</kbd></td>
+        <td><kbd>End</kbd> or <br><kbd>Fn</kbd> + <kbd>ArrowRight</kbd></td>
         <td>Move the playhead to the end of the file</td>
     </tr>
     <tr>
-        <td><kbd>PgUp (Fn + ArrowUp)</kbd></td>
+        <td><kbd>PgUp</kbd> or <br><kbd>Fn</kbd> + <kbd>ArrowUp</kbd></td>
         <td>Move the playhead back by a screen width</td>
     </tr>
     <tr>
-        <td><kbd>PgDn  (Fn + ArrowDown)</kbd></td>
+        <td><kbd>PgDn</kbd> or <br><kbd>Fn</kbd> + <kbdArrowDown</kbd></td>
         <td>Move the playhead forward by a screen width</td>
     </tr>
     <tr>
@@ -85,40 +85,40 @@
         <td>Move the playhead backward. </td>
     </tr>
     <tr>
-        <td><kbd>Tab or Down Arrow (&darr;)</kbd></td>
+        <td><kbd>Tab</kbd> or <br><kbd>Down Arrow (&darr;)</kbd></td>
         <td>Skip to the next detection</td>
     </tr>
     <tr>
-        <td><kbd>Shift Tab or Up Arrow (&uarr;)</kbd></td>
+        <td><kbd>Shift</kbd> + <kbd>Tab</kbd> or <br><kbd>Up Arrow (&uarr;)</kbd></td>
         <td>Skip back to the previous detection</td>
     </tr>
     <tr>
         <td colspan="2" class="text-center text-bg-light"><h5>Spectrogram</h5></td>
     </tr>
     <tr>
-        <td><kbd>Plus (+) </kbd></td>
+        <td><kbd>+</kbd></td>
         <td>Zoom in on the spectrogram. When zooming, Chirpity automatically adjusts the short-time Fourier transform (STFT) window size to optimize
             the spectral resolution
         </td>
     </tr>
     <tr>
-        <td><kbd>Minus (-)</kbd></td>
+        <td><kbd>-</kbd></td>
         <td>Zoom out the spectrogram. When zooming, Chirpity automatically adjusts the STFT window size to optimize the
             spectral resolution
         </td>
     </tr>
     <tr>
-        <td><kbd>Ctrl Plus (+) </kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>+</kbd> or <kbd>F5</kbd></td>
         <td>Manually reduce the spectrogram window size. Adjusting the window size has the effect of sharpening / blurring the calls in the spectrogram.
         </td>
     </tr>
     <tr>
-        <td><kbd>Ctrl Minus (-)</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>-</kbd> or <kbd>F4</kbd</td>
         <td>Manually increase the spectrogram window size
         </td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-T</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>T</kbd></td>
         <td>Toggle between Timecode and Time of Day</td>
     </tr>
     <tr>
@@ -129,11 +129,11 @@
         <td>Delete current record</td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-Z</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>Z</kbd></td>
         <td>Restore deleted record(s)</td>
     </tr>
     <tr>
-        <td><kbd>Ctrl-V</kbd></td>
+        <td><kbd>Ctrl</kbd> + <kbd>V</kbd></td>
         <td>Validate the current active record (confirm the detection)</td>
     </tr>
 </table>
diff --git a/css/style.css b/css/style.css
index 79c99e67..0e0dc5e4 100644
--- a/css/style.css
+++ b/css/style.css
@@ -160,7 +160,7 @@ select {
 
 .shortcut {
     color: #666;
-    font-size: 14px;
+    font-size: calc(14px * var(--font-size-scale));
     vertical-align: -webkit-baseline-middle;
 }
 
@@ -192,7 +192,7 @@ ul {
     /* Add some padding */
     text-decoration: none;
     /* Remove default text underline */
-    font-size: 14px;
+    font-size: calc(14px * var(--font-size-scale));
     /* Increase the font-size */
     color: black;
     /* Add a black text color */
@@ -487,7 +487,7 @@ footer {
     justify-content: center;
     align-items: center;
     text-align: center;
-    font-size: small;
+    font-size: calc(14px * var(--font-size-scale));;
     color: white;
 }
 
@@ -583,7 +583,7 @@ input[type="range"].vertical {
     width: calc(20px * var(--font-size-scale));
     height: calc(20px * var(--font-size-scale));
     border-radius: 50%;
-    font-size: medium;
+    font-size: calc(14px * var(--font-size-scale));
     background-color: gray;
     color: white;
     text-align: center;
@@ -704,7 +704,7 @@ input[type="range"].vertical {
     position: relative;
     display: flex;
     justify-content: space-between;
-    font-size: 16px;
+    font-size: calc(16px * var(--font-size-scale));
     color: #ffffff;
   }
   
@@ -743,8 +743,8 @@ input[type="range"].vertical {
   .range_container input[type="number"] {
     color: #929292;
     width: 80px;
-    height: 24px;
-    font-size: 20px;
+    height: calc(24px * var(--font-size-scale));
+    font-size: calc(20px * var(--font-size-scale));
     border: none;
   }
   
diff --git a/js/ui.js b/js/ui.js
index 2cbb17b2..4c15cf3f 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -2964,6 +2964,8 @@ function centreSpec(){
         '=': function (e) {e.metaKey || e.ctrlKey ? reduceFFT() : zoomSpec('zoomIn')},
         '+': function (e) {e.metaKey || e.ctrlKey ? reduceFFT() : zoomSpec('zoomIn')},
         '-': function (e) {e.metaKey || e.ctrlKey ? increaseFFT() : zoomSpec('zoomOut')},
+        'F5': function (e) { reduceFFT() },
+        'F4': function (e) { increaseFFT() },
         ' ': function () { wavesurfer && wavesurfer.playPause() },
         Tab: function (e) {
             if ((e.metaKey || e.ctrlKey) && ! PREDICTING) { // If you did this when predicting, your results would go straight to the archive

From e4d8afb3125d5cd3b5a36864d3a68e84799c9b18 Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 13:37:27 +0100
Subject: [PATCH 14/15] position zoom icons

---
 css/style.css | 1 +
 index.html    | 8 ++++----
 js/ui.js      | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/css/style.css b/css/style.css
index 0e0dc5e4..591650a1 100644
--- a/css/style.css
+++ b/css/style.css
@@ -141,6 +141,7 @@ div#contentWrapper.loaded {
 }
 
 .zoom {
+    position: absolute;
     font-size: calc(32px * var(--font-size-scale));;
 }
 
diff --git a/index.html b/index.html
index e755b2bb..8a6cbf8a 100644
--- a/index.html
+++ b/index.html
@@ -1126,7 +1126,7 @@ <h5 class="modal-title" id="locationModalLabel">Set Location</h5>
                         <span class="material-symbols-outlined"  title="Display File Metadata">other_admission</span></a>
                     <div id="filename" class="col-auto ps-1 overflow-visible flex-nowrap"></div>
                     <div id="unsaved-icon" class="material-symbols-outlined ms-2 me-2 text-warning pointer d-none"  tabindex="-1" data-bs-toggle="popover" data-bs-trigger="focus" data-bs-title="Unsaved Edits" id="Unsaved Edits-circle-help"  data-bs-content="There are changes to the results that haven't been saved.">warning</div>
-                    <div class="col-auto btn-group bg-dark ms-2 me-2 text-nowrap" role="group">
+                    <div class="btn-group bg-dark pt-0 p-1 ms-2 me-2 text-nowrap" role="group">
                         <button id="playToggle" class="p-1 pe-2 btn btn-outline-secondary" title="Play / Pause (SpaceBar)">
                             <span class="material-symbols-outlined ">play_circle</span><span
                             class="align-middle d-none d-lg-inline"> Play </span>
@@ -1135,13 +1135,13 @@ <h5 class="modal-title" id="locationModalLabel">Set Location</h5>
                             class="align-middle d-none d-lg-inline-block">Pause</span>
                         </button>
                     </div>
-                    <div class="col btn-group bg-dark  pe-2" role="group">
+                    <div class="col btn-group bg-dark pt-0 p-1 pe-2" role="group">
                         <button id="zoomIn" title="Zoom into the spectrogram (Keyboard Shortcut: + key)" class="btn btn-outline-secondary"
                         style="max-width: 70px">
-                        <span class="material-symbols-outlined zoom">zoom_in</span>
+                        <span class="material-symbols-outlined zoom translate-middle">zoom_in</span>
                     </button>
                     <button id="zoomOut" title="Zoom out of the spectrogram (Keyboard Shortcut: - key)" class="btn btn-outline-secondary"
-                    style="max-width: 70px"><span class="material-symbols-outlined zoom align-middle">zoom_out</span>
+                    style="max-width: 70px"><span class="material-symbols-outlined zoom  translate-middle">zoom_out</span>
                 </button>
             </div>
             <div id="progressDiv" class="col-2 d-none"><span id="fileNumber"></span><br>
diff --git a/js/ui.js b/js/ui.js
index 7fab4778..9eb9f1fd 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -703,7 +703,7 @@ function formatAsBootstrapTable(jsonData) {
     let tableHtml = "<div class='metadata'>";
 
     for (const [heading, keyValuePairs] of Object.entries(parsedData)) {
-        tableHtml += `<h3>${heading}</h3>`;
+        tableHtml += `<h5 class="text-primary">${heading.toUpperCase()}</h5>`;
         tableHtml += "<table class='table table-striped table-bordered'><thead class='text-bg-light'><tr><th>Key</th><th>Value</th></tr></thead><tbody>";
 
         for (const [key, value] of Object.entries(keyValuePairs)) {
@@ -3751,9 +3751,9 @@ function formatDuration(seconds){
         const response = await fetch(file);
         document.getElementById('helpModalBody').innerHTML = await response.text();
         const help = new bootstrap.Modal(document.getElementById('helpModal'));
+        document.removeEventListener('show.bs.modal', replaceCtrlWithCommand);
+        document.addEventListener('show.bs.modal', replaceCtrlWithCommand);
         help.show();
-        document.removeEventListener('shown.bs.modal', replaceCtrlWithCommand);
-        document.addEventListener('shown.bs.modal', replaceCtrlWithCommand);
     }
     function replaceTextInTitleAttributes() {
         // Select all elements with title attribute in the body of the web page
@@ -3771,6 +3771,7 @@ function formatDuration(seconds){
     }
     
     function replaceCtrlWithCommand() {
+        if (isMac){
             // Select all text nodes in the body of the web page
             const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT, null, false);
             const nodes = [];
@@ -3786,6 +3787,7 @@ function formatDuration(seconds){
             
             // Replace 'Ctrl' with ⌘ in title attributes of elements
             replaceTextInTitleAttributes();
+        }
     }
     
     const populateSpeciesModal = async (included, excluded) => {

From 79c1f442ddb4cb37d21f8e1ae71de4c12f8a670a Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Fri, 18 Oct 2024 13:57:48 +0100
Subject: [PATCH 15/15] turned off debug mode

---
 js/worker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/worker.js b/js/worker.js
index fc05e7e9..eb99a65a 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -16,7 +16,7 @@ import { sqlite3 } from './database.js';
 import {trackEvent} from './tracking.js';
 import {extractWaveMetadata} from './metadata.js';
 
-const DEBUG = true;
+const DEBUG = false;
 
 // Function to join Buffers and not use Buffer.concat() which leads to detached ArrayBuffers
 function joinBuffers(buffer1, buffer2) {