Part 2 of precedent commit

Almyria · Jul 7, 2024 · 9a69800 · 9a69800
1 parent 6a7a9c9
commit 9a69800
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/src/assets/js/index.js b/src/assets/js/index.js
@@ -5,6 +5,7 @@
 
 'use strict';
 const { ipcRenderer } = require('electron');
+const os = require('os');
 import { config } from './utils.js';
 
 let dev = process.env.NODE_ENV === 'dev';
@@ -53,6 +54,22 @@ class Splash {
         this.checkUpdate();
     }
 
+    showMacOSUpdateDialog() {
+        const options = {
+            type: 'info',
+            buttons: ['Télécharger la mise à jour', 'Fermer'],
+            message: 'Une nouvelle mise à jour est disponible. Veuillez télécharger la dernière mise à jour.'
+        };
+
+        dialog.showMessageBox(options).then(response => {
+            if (response.response === 0) {
+                shell.openExternal('https://github.com/Almyria/launcher/releases');
+            } else {
+                app.quit();
+            }
+        });
+    }
+
     async checkUpdate() {
         if (dev) return this.startLauncher();
         this.setStatus(`Recherche de mise à jour...`);
@@ -65,9 +82,14 @@ class Splash {
         });
 
         ipcRenderer.on('updateAvailable', () => {
-            this.setStatus(`Mise à jour disponible !`);
-            this.toggleProgress();
-            ipcRenderer.send('start-update');
+            if (os.platform() === 'darwin') { // if the OS is MacOS
+                this.setStatus(`Mise à jour disponible !`);
+                this.showMacOSUpdateDialog();
+            } else {
+                this.setStatus(`Mise à jour disponible !`);
+                this.toggleProgress();
+                ipcRenderer.send('start-update');
+            }
         })
 
         ipcRenderer.on('download-progress', (event, progress) => {

diff --git a/src/assets/js/panels/home.js b/src/assets/js/panels/home.js
@@ -119,7 +119,7 @@ class Home {
         fetch(`${pkg.cdn_url}/files_to_delete.json`)
         .then(response => response.json())
         .then(filesToDelete => {
-            const appDataPath = path.join(dataDirectory, '.almyriacraft-s7');
+            const appDataPath = `${dataDirectory}/${process.platform == 'darwin' ? self.config.dataDirectory : `.${self.config.dataDirectory}`}`;;
 
             for (const file of filesToDelete) {
                 const filePath = path.join(appDataPath, file);

diff --git a/src/assets/js/panels/settings.js b/src/assets/js/panels/settings.js
@@ -197,7 +197,7 @@ class Settings {
             let confirmation = confirm("Êtes-vous sûr de vouloir réinitialiser le dossier du jeu ?");
             if(!confirmation) return;
 
-            const directoryPath = path.join(dataDirectory, '.almyriacraft-s7');
+            const directoryPath = `${dataDirectory}/${process.platform == 'darwin' ? this.config.dataDirectory : `.${this.config.dataDirectory}`}`;
 
             // Sélectionner la classe modal et l'afficher
             let modal = document.getElementById('alert-modal-deletion');
@@ -223,7 +223,7 @@ class Settings {
             modal.style.display = 'block';
 
             setTimeout(() => {
-                const directoryPath = path.join(dataDirectory, '.almyriacraft-s7');
+                const directoryPath = `${dataDirectory}/${process.platform == 'darwin' ? this.config.dataDirectory : `.${this.config.dataDirectory}`}`;;
 
                 if (fs.existsSync(directoryPath)) {
                     fs.rmdirSync(directoryPath, { recursive: true });