Update checking and notification for Mac

Mattk70 · Jan 31, 2024 · 2cfb71c · 2cfb71c
1 parent 7dee900
commit 2cfb71c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/index.html b/index.html
@@ -35,12 +35,6 @@
 </head>
 
 <body>
-    <!-- Loading Spinner Overlay -->
-<div id="loadingOverlay" class="overlay d-none">
-    <div class="spinner-border" role="status">
-        <span class="visually-hidden">Loading...</span>
-    </div>
-</div>
     <!-- The modal for the tour -->
     <div class="modal modal-lg modal-fade" id="tourModal" tabindex="-1" aria-labelledby="tourModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered">
@@ -1208,7 +1202,19 @@ <h5 class="modal-title" id="locationModalLabel">Set Location</h5>
                         </div>
 
                     </div>
-
+                    <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+                        <symbol id="check-circle-fill" viewBox="0 0 16 16">
+                          <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
+                        </symbol>
+                        <symbol id="info-fill" viewBox="0 0 16 16">
+                          <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
+                        </symbol>
+                        <symbol id="exclamation-triangle-fill" viewBox="0 0 16 16">
+                          <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
+                        </symbol>
+                    </svg>
+                        <!-- Update alert placeholder -->
+                        <div id="liveAlertPlaceholder" style="position:absolute; bottom: 10px;"></div>
                         <!-- Footer -->
                         <footer class="p-1 text-bg-primary" id="footer">
                             <div class="d-none text-sm-start" id="update-progress">Downloading update: 

diff --git a/js/ui.js b/js/ui.js
@@ -1493,7 +1493,7 @@ window.onload = async () => {
         }
         // check for new version on mac platform. pkg containers are not an auto-updatable target
         // https://www.electron.build/auto-update#auto-updatable-targets
-        (config.debug || isMac) && checkForMacUpdates()
+        isMac && checkForMacUpdates();
     }
     )
     // establish the message channel
@@ -4417,9 +4417,9 @@ window.electron.onDownloadProgress((_event, progressObj) => {
 });
 
 // CI functions
-function getFileLoaded() {return fileLoaded};
-function donePredicting() {return !PREDICTING};
-function  getAudacityLabels() {return AUDACITY_LABELS[currentFile]};
+const getFileLoaded = () => fileLoaded;
+const donePredicting = () => !PREDICTING;
+const getAudacityLabels = () => AUDACITY_LABELS[currentFile];
 
 
 // Update checking for Mac 
@@ -4428,26 +4428,30 @@ function checkForMacUpdates() {
     // Do this at most daily
     const latestCheck = Date.now()
     const checkDue = (latestCheck - config.lastUpdateCheck) > 86_400_000;
-    if (config.debug || checkDue){
+    if (checkDue){
         fetch('https://api.github.com/repos/Mattk70/Chirpity-Electron/releases/latest')
             .then(response => response.json())
             .then(data => {
                 const latestVersion = data.tag_name;
-                const releaseNotes = data.body;
-                const downloadUrl = data.assets.find(asset => asset.name.endsWith('.pkg')).browser_download_url;
-
                 const latest = parseSemVer(latestVersion);
                 const current = parseSemVer(VERSION);
 
                 if (config.debug || isNewVersion(latest, current)) {
-                    const notification = new Notification({
-                        title: `Chirpity ${latestVersion} Available!`,
-                        body: `Release notes:\n${releaseNotes}`,
-                    });
-                    notification.on('click', () => {
-                        require('electron').shell.openExternal(downloadUrl);
-                    });
-                    notification.show();
+                    const alertPlaceholder = document.getElementById('liveAlertPlaceholder')
+                    const alert = (message, type) => {
+                        const wrapper = document.createElement('div')
+                        wrapper.innerHTML = [
+                            `<div class="alert alert-${type} alert-dismissible" role="alert">`,
+                            `   <div>${message}</div>`,
+                            '   <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>',
+                            '</div>'
+                        ].join('')
+                        alertPlaceholder.append(wrapper)
+                    }
+                    alert(`
+                    <svg class="bi flex-shrink-0 me-2" width="20" height="20" role="img" aria-label="Info:"><use xlink:href="#info-fill"/></svg>
+                    There's a new version of Chirpity available! <a href="https://chirpity.mattkirkland.co.uk?fromVersion=${VERSION}" target="_blacnk">Check the website</a> for more information`,
+                    'info')
                 }
                 config.lastUpdateCheck = latestCheck;
                 updatePrefs()