Remove use of Saver object from renderer

Don't need it!
Tasarinan · May 14, 2020 · b3e9d6e · b3e9d6e
1 parent 07ca764
commit b3e9d6e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/src/renderer/Editor.vue b/src/renderer/Editor.vue
@@ -177,8 +177,6 @@ import SaverOptionInput from "@/components/SaverOptionInput";
 import SaverOptions from "@/components/SaverOptions";
 import Noty from "noty";
 
-import Saver from "@/../lib/saver";
-
 const { ipcRenderer } = require("electron");
 
 export default {
@@ -317,14 +315,12 @@ export default {
     closeWindow() {
       ipcRenderer.send("close-window", "editor");
     },
-    saveData() {
+    async saveData() {
       this.disabled = true;
 
       this.saver.options = this.options;
 
-      // @todo use ipc to update saver?
-      const s = new Saver(this.saver);
-      s.write(this.saver, this.src);
+      await ipcRenderer.invoke("save-screensaver", this.saver, this.src);
       ipcRenderer.send("savers-updated", this.src);
 
       new Noty({
@@ -339,8 +335,8 @@ export default {
 
       this.disabled = false;
     },
-    saveDataAndClose() {
-      this.saveData();
+    async saveDataAndClose() {
+      await this.saveData();
       this.closeWindow();
     },
     openFolder() {

diff --git a/src/renderer/Prefs.vue b/src/renderer/Prefs.vue
@@ -71,8 +71,6 @@ import SaverOptions from "@/components/SaverOptions";
 import SaverSummary from "@/components/SaverSummary";
 import Noty from "noty";
 
-import Saver from "@/../lib/saver";
-
 const { ipcRenderer } = require("electron");
 const log = require("electron-log");
 
@@ -217,29 +215,25 @@ export default {
       ipcRenderer.send("open-window", "settings");
     },
     async getData() {
-      const tmpList = await ipcRenderer.invoke("list-savers");
-      // @todo shouldn't need Saver object here
-      this.savers = tmpList.map((data) => {
-        return new Saver(data);
-      });
-
       var tmp = {};
+      this.savers = await ipcRenderer.invoke("list-savers");
 
       if ( this.savers.length <= 0 ) {
         return;
       }
         
       // ensure default settings in the config for all savers
-      for(var i = 0, l = this.savers.length; i < l; i++ ) {
-        var s = this.savers[i];
-
-        //        tmp[s.key] = this.prefs.getOptions(s.key);
-        // if ( tmp[s.key] === undefined ) {
-        //   tmp.options[s.key] = {};
-        // }
+      this.savers = this.savers.map((s) => {
+        if ( s.settings === undefined ) {
+          s.settings = {};
+        }
+        return s;
+      });
 
+      // generate a hash of saver options by key
+      this.savers.forEach((s) => {
         tmp[s.key] = s.settings;
-      }
+      });
 
       this.options = Object.assign({}, this.options, tmp);