Added a export data module to save Data and settings files as a zip f…

…ile easy, also bumped version number. Added a shortcuts enabled indicator in moduleView, it also acts as a toggle button so the one in settings is kinda useless? And made ping pong lifeCycle timer 3 > 7 seconds to counter reloading window

AppSettings.json

@@ -1,6 +1,6 @@
 {
  "PluginID": "com.villeolof.toolbox",
- "Version": "1.0.2",
+ "Version": "1.0.3",
  "DataCollection": true,
  "Debug": false,
  "DisableShortcut-Keybind": "F1",
@@ -9,12 +9,12 @@
  "UpdateLoop_DelaySeconds": 4
  },
  "WindowSize": {
- "width": 1558,
- "height": 816
+ "width": 1275,
+ "height": 824
  },
  "WindowPosition": {
- "x": 2811,
- "y": 368
+ "x": 300,
+ "y": 121
  },
  "AlwaysOnTop": false,
  "MirrorFlipped": false

Electron/main.js

@@ -60,14 +60,14 @@ ipcMain.handle('keybind:unsetAll', (event) => {
  globalShortcut.unregisterAll();
 });
 
-let oldTimeout = null;
-ipcMain.handle('lifeCycle:ping', (event) => {
- clearTimeout(oldTimeout);
+// let oldTimeout = null;
+// ipcMain.handle('lifeCycle:ping', (event) => {
+//  clearTimeout(oldTimeout);
 
- oldTimeout = setTimeout(() => {
- app.quit();
- }, 7000);
-});
+//  oldTimeout = setTimeout(() => {
+//  app.quit();
+//  }, 7000);
+// });
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.

TODO.md

@@ -6,10 +6,9 @@ And list of priorities.
 ## High Priority 
 
 - Improve Dev Version (And make it public) 
-- Export/Import AppSettings/Data/Settings *(Move to own folder?)* 
-- Updater.js (Check for updates, and update source files) 
+- Import AppSettings/Data/Settings *(Move to own folder?)* 
 - Update DataStore to be more like Settings in terms of data loading. 
-- Add an indicator in moduleView that shortcuts are enabled/disabled.
+- Fix lifeCycle / Electron ping pong to make it not close on dialogs and such.
 
 ## Other Stuff 
 

src/Components/Settings.svelte

@@ -271,6 +271,33 @@
  AppSettings.SetSetting('MirrorFlipped', !MirrorFlipped);
  }
  let DisableKeybindTextPrefix = AppSettings.GetSetting("DisabledShortcuts", false) ? "Enable" : "Disable";
+
+ const ExportDataToZIP = () => {
+ const filesToZIP = ["Data.json", "Settings.json"];
+
+ const AdmZip = Common.GetAdmZipModule();
+ const zip = new AdmZip();
+
+ //prompt user for save location
+ const saveLocation = Common.IO.Dialog({
+ title: "Save Location",
+ defaultPath: `${__dirname}../`,
+ buttonLabel: "Save",
+ properties: ['openDirectory']
+ })[0];
+ if (!saveLocation) return;
+
+ //add files to zip
+ for (const file of filesToZIP) {
+ const filePath = path.join(__dirname, '..', file);
+ zip.addLocalFile(filePath);
+ }
+
+ //write zip to disk
+ if (AppSettings.GetSetting('Debug')) console.log(`Writing zip to ${saveLocation}`);
+ zip.writeZip(path.join(saveLocation, 'ToolboxData.zip'));
+ }
+
  // ------------
  function GetSettingInstances(): {[key: string]: Settings} {
  const settingInstances: {[key: string]: Settings} = {};
@@ -305,6 +332,7 @@
  <button class="btnStyle" on:click={ClearColumns}>Clear All Columns</button>
  <button class="btnStyle" on:click={OpenModuleFolder}>Open Modules Folder</button>
  <button class="btnStyle" on:click={() => { DisableKeybindTextPrefix = Common.Electron.DisableAllShortcutsAction() }}>{DisableKeybindTextPrefix} Shortcuts</button>
+ <button class="btnStyle" on:click={ExportDataToZIP}>Export Data</button>
  </div>
  </div>
 

src/Lib/Common.ts

@@ -559,4 +559,13 @@ export namespace Common {
  export function GetOSModule(): typeof os {
  return os;
  }
+
+ /**
+ * Gets the adm-zip node module.
+ * 
+ * @returns the adm-zip node module
+ */
+ export function GetAdmZipModule() {
+ return require('adm-zip');
+ }
 }

src/main.ts

@@ -13,9 +13,9 @@ import { GlobalSettings } from './Lib/Settings'
 GlobalSettings.LoadGlobalSettings();
 
 //Keeping the plugin, otherwise we close the plugin.
-setInterval(async () => {
- await Common.Electron.GetElectron().ipcRenderer.invoke('lifeCycle:ping');
-}, 1000);
+// setInterval(async () => {
+//  await Common.Electron.GetElectron().ipcRenderer.invoke('lifeCycle:ping');
+// }, 1000);
 
 //This specific line is somehow always complaining.
 //but it still works and its the default svelte app template.