Merge branch 'main' of https://github.com/Makpptfox/New-World-Refining-Calculator

Author: Makpptfox

data/image/ui/settings.png

@@ -6,6 +6,25 @@
     <title>New World</title>
     <!-- Ne pas toucher -->
 
+    <!--<test> FOR TEST PURPOSE ONLY
+        <name>test_item</name>
+        <id>TEST_item</id>
+        <jobId>0</jobId>
+        <image>iron_ingot.png</image>
+        <related>
+            <rel0>
+                <id>SM_irnin</id>
+                <number>3</number>
+                <details>true</details>
+            </rel0>
+            <rel1>
+                <id>SM_stlin</id>
+                <number>3</number>
+                <details>true</details>
+            </rel1>
+        </related>
+    </test>-->
+
     <materials>
         <!-- Refining materials -->
         <obsidian_flux>

data/materials/materials.xml

@@ -6,6 +6,7 @@
 
         <removeall>Remove All</removeall>
         <titleItemBar>Items for</titleItemBar>
+        <titleItemRarity>Rarity: </titleItemRarity>
         <addItem>Add</addItem>
         <defaultTab>Default</defaultTab>
         <addTab>+ New tab</addTab>
@@ -14,7 +15,7 @@
         <cut>Cut gems</cut>
         <parameterTitle>Settings</parameterTitle>
         <parameterLang>Language: </parameterLang>
-        <ParameterAutoUpdate>Auto-update on start-up: </ParameterAutoUpdate>
+        <parameterAutoUpdate>Auto-update on start-up: </parameterAutoUpdate>
         <parameterWarning>Each change will AUTOMATICALLY restart the application!</parameterWarning>
         <aboutTitle>About</aboutTitle>
 

lang/ui/en-EN.xml

@@ -7,8 +7,6 @@ const { v4: uuidv4 } = require('uuid');
 
 const fs = require('fs');
 
-const build = true
-
 const path = require('path');
 
 const {checkLang} = require("./script/lang/getLanguage");
@@ -28,6 +26,8 @@ let langUI;
 let updaterWindows;
 let mainWindows;
 
+let autoUpdate = false;
+
 autoUpdater.on('error', (err)=>{
     updaterWindows.webContents.send('update_error', err);
 })
@@ -125,20 +125,43 @@ async function checkDataFile(){
 
 function createWindow(){
     mainWindows = new BrowserWindow({
-        width: 800,
-        height: 400,
+        minWidth: 1600,
+        minHeight: 800,
         autoHideMenuBar: true,
         webPreferences:{
             nodeIntegration: false, // is default value after Electron v5
             contextIsolation: true, // protect against prototype pollution
             enableRemoteModule: false, // turn off remote
             preload: path.join(__dirname, "/script/preload.js"), // use a preload script
             nativeWindowOpen: true
-        }
+        },
+        titleBarStyle: 'hidden'
     })
 
     mainWindows.loadFile('pages/index.html');
 
+    mainWindows.on('unmaximize', (e)=>{
+
+        mainWindows.webContents.send('minSizeResponse');
+
+        e.returnValue = null;
+    })
+    mainWindows.on('maximize', (e)=>{
+
+        mainWindows.webContents.send('maxSizeResponse');
+
+        e.returnValue = null;
+    })
+    let handleRedirect = (e, url) => {
+        if(url !== webContents.getURL()) {
+            e.preventDefault()
+            require('electron').shell.openExternal(url)
+        }
+    }
+
+    mainWindows.webContents.on('will-navigate', handleRedirect)
+    mainWindows.webContents.on('new-window', handleRedirect)
+
 }
 function createLoader(){
     updaterWindows = new BrowserWindow({
@@ -164,31 +187,72 @@ function createLoader(){
     updaterWindows.loadFile('pages/update.html');
 
     updaterWindows.once("ready-to-show", ()=>{
-        autoUpdater.checkForUpdatesAndNotify();
+
+        fs.access(app.getPath('userData')+"/data/settings.json", async (err) => {
+
+            if (err !== null) {
+
+                console.error(err);
+
+                let data = {
+                    "settings":
+                        {
+                            "lang": "en-EN",
+                            "autoupdate": false
+                        }
+                }
+
+                await mkdirp(app.getPath('userData') + "/data/");
+                fs.writeFile(app.getPath('userData') + "/data/settings.json", JSON.stringify(data), (err1) => {
+
+                    checkDataFile()
+
+                })
+            } else {
+
+                fs.readFile(app.getPath('userData') + "/data/settings.json", (err1, data) => {
+
+                    let result = JSON.parse(data.toString("utf-8"))
+
+                    let setting = result['settings']
+
+                    lang = setting['lang'];
+                    autoUpdate = setting['autoupdate'];
+
+                    if (!autoUpdate) {
+
+                        checkDataFile()
+
+                    } else {
+
+                        autoUpdater.checkForUpdatesAndNotify();
+
+                    }
+                })
+
+            }
+        });
 
     })
 
-    if(!build) checkDataFile();
 
 }
 
 app.whenReady().then(() => {
+    process.setMaxListeners(0)
     createLoader()
 
     app.on('activate', function () {
         if (BrowserWindow.getAllWindows().length === 0) createWindow()
     })
 
-
 })
 app.on('window-all-closed', function () {
     if (process.platform !== 'darwin') app.quit()
 })
 
 ipcMain.on('getAllJobs', async (ipc)=>{
 
-    console.log('receive getAllJobs');
-
     mainWindows.webContents.send('getAllJobsResponse', jobData);
 
 })
@@ -203,12 +267,8 @@ ipcMain.on('getUID', (ipc)=>{
 
 ipcMain.on('getDataFrom', async (ipc, path)=>{
 
-    console.log('execute getDataFrom function');
-
     await getDataFrom(path, (data) => {
 
-        console.log('return of getDataFrom function');
-
         mainWindows.webContents.send('getDataFromResponse', data);
 
     })
@@ -217,16 +277,12 @@ ipcMain.on('getDataFrom', async (ipc, path)=>{
 
 ipcMain.on('getAllItems', async (ipc)=>{
 
-    console.log('receive getAllItem');
-
     mainWindows.webContents.send('getAllItemsResponse', materialsData);
 
 })
 
 ipcMain.on("getLang", async (ipc, type, elem = null, key = -1)=>{
 
-    console.log('execute getLang function');
-
     switch (type) {
 
         case "jobs":{
@@ -244,8 +300,6 @@ ipcMain.on("getLang", async (ipc, type, elem = null, key = -1)=>{
 
             mainWindows.webContents.send('getLangResponse', type, job);
 
-            console.trace(elem);
-
             break;
         }
         case "rarity":{
@@ -260,8 +314,6 @@ ipcMain.on("getLang", async (ipc, type, elem = null, key = -1)=>{
 
             mainWindows.send('getLangResponse', type, rarity, key);
 
-            console.trace(rarity)
-
             break;
         }
         case "item":{
@@ -270,25 +322,22 @@ ipcMain.on("getLang", async (ipc, type, elem = null, key = -1)=>{
                 id: elem.id,
                 jobId: elem.jobId,
                 image: elem.image,
-                related: elem.related
+                related: elem.related,
+                cat: elem.cat
             };
 
-            console.trace(langMaterials);
+            material.name = langMaterials["materials"][0][elem.name.toLowerCase()];
 
-            material.name = langMaterials["materials"][0][elem.name.toLowerCase()][0];
 
             if(material.name === undefined){
                 material.name = `lang: ${lang} ${elem.name.toLowerCase()}`;
             }
 
             mainWindows.webContents.send('getLangResponse', type, material, key);
 
-            console.trace(material);
-
             break;
         }
         case "ui":{
-            console.trace(langUI["default"][0]);
 
             mainWindows.webContents.send('getLangResponse', type, langUI["default"][0], key);
         }
@@ -299,9 +348,7 @@ ipcMain.on("getLang", async (ipc, type, elem = null, key = -1)=>{
 
 ipcMain.on('getSavedTab', async (ipc)=>{
 
-    console.log("getSavedTab");
-
-    fs.access(process.cwd()+"/data/save/tabs.json", async (err) => {
+    fs.access(app.getPath('userData')+"/data/save/tabs.json", async (err) => {
 
         if(err !== null){
 
@@ -313,18 +360,15 @@ ipcMain.on('getSavedTab', async (ipc)=>{
                 }
             }
 
-            await mkdirp(process.cwd()+"/data/save/");
-            fs.writeFile(process.cwd()+"/data/save/tabs.json", JSON.stringify(data), (err1)=>{
-
-                console.log("writeFile");
-                console.error(err1);
+            await mkdirp(app.getPath('userData')+"/data/save/");
+            fs.writeFile(app.getPath('userData')+"/data/save/tabs.json", JSON.stringify(data), (err1)=>{
 
                 mainWindows.webContents.send('getSavedTabResponse', data, false);
 
             })
         } else {
 
-            fs.readFile(process.cwd()+"/data/save/tabs.json", (err1, data) => {
+            fs.readFile(app.getPath('userData')+"/data/save/tabs.json", (err1, data) => {
 
                 mainWindows.webContents.send('getSavedTabResponse', JSON.parse(data.toString("utf-8")), true);
 
@@ -340,24 +384,78 @@ ipcMain.on('getSavedTab', async (ipc)=>{
 
 ipcMain.on('deleteTab', (ipc, data)=>{
 
-    console.log("deleteTab");
-
-    fs.writeFile(process.cwd()+"/data/save/tabs.json", "", ()=>{
+    fs.writeFile(app.getPath('userData')+"/data/save/tabs.json", "", ()=>{
         mainWindows.webContents.send('deleteTabResponse');
     })
 
 })
 
 ipcMain.on('saveTab', (ipc, data)=>{
 
-    console.log("saveTab");
-
-    fs.writeFile(process.cwd()+"/data/save/tabs.json", JSON.stringify(data), ()=>{
+    fs.writeFile(app.getPath('userData')+"/data/save/tabs.json", JSON.stringify(data), ()=>{
         mainWindows.webContents.send('saveTabResponse');
     })
 
 })
 
+ipcMain.once('closeApp', (ipc)=>{
+
+    app.quit();
+
+})
+
+ipcMain.on('minApp', (ipc)=>{
+
+    mainWindows.minimize();
+
+})
+
+ipcMain.on('maxSize', (ipc)=>{
+
+    mainWindows.maximize();
+
+})
+
+ipcMain.on('minSize', (ipc)=>{
+
+    mainWindows.unmaximize();
+
+})
+
+ipcMain.once('restartApp', (ipc)=>{
+
+    app.relaunch();
+    app.exit();
+
+})
+
+ipcMain.on('getLanguage', (ipc)=>{
+
+    checkLang((langs)=>{
+
+        mainWindows.webContents.send('getLanguageResponse', {'chosen': lang, 'langs': langs});
+
+    })
+
+})
+
+ipcMain.on('getAutoUpdate', (ipc)=>{
+
+    mainWindows.webContents.send('getAutoUpdateResponse', autoUpdate);
+
+});
+
+ipcMain.on('setSettings', (ipc, setting)=>{
+
+    fs.writeFile(app.getPath('userData')+'/data/settings.json', JSON.stringify(setting), ()=>{
+
+        mainWindows.webContents.send('setSettingsResponse');
+
+
+
+    })
+
+})
 
 // Function for the auto-updater
 ipcMain.on('installUpdate', (ipc)=>{

main.js

@@ -1,6 +1,6 @@
 {
   "name": "new-world-refining-calculator",
-  "version": "1.0.6",
+  "version": "0.0.9",
   "description": "",
   "main": "main.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "build": {
     "appId": "fr.new-world-refining-calculator.ward",
     "directories": {
-      "buildResources": "resources"
+      "buildResources": "build"
     },
     "extraFiles": [
       "data",