Merge branch 'develop' into feature/features-api

2 files changed, 37 insertions, 14 deletions

diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 824b4c20c..7b04406a2 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,27 +1,46 @@
-import { observable } from 'mobx';
+import { observable, toJS } from 'mobx';
+import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
 
-import { DEFAULT_APP_SETTINGS } from '../config';
+import { SETTINGS_PATH, DEFAULT_APP_SETTINGS } from '../config';
+
+const debug = require('debug')('Franz:Settings');
 
 export default class Settings {
-  @observable store = {
-    autoLaunchOnStart: DEFAULT_APP_SETTINGS.autoLaunchOnStart,
-    autoLaunchInBackground: DEFAULT_APP_SETTINGS.autoLaunchInBackground,
-    runInBackground: DEFAULT_APP_SETTINGS.runInBackground,
-    enableSystemTray: DEFAULT_APP_SETTINGS.enableSystemTray,
-    minimizeToSystemTray: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
-    locale: DEFAULT_APP_SETTINGS.locale,
-    beta: DEFAULT_APP_SETTINGS.beta,
-  };
+  @observable store = DEFAULT_APP_SETTINGS;
+
+  constructor() {
+    if (!pathExistsSync(SETTINGS_PATH)) {
+      this._writeFile();
+    } else {
+      this._hydrate();
+    }
+  }
 
   set(settings) {
-    this.store = Object.assign(this.store, settings);
+    this.store = this._merge(settings);
+
+    this._writeFile();
   }
 
-  all() {
+  get all() {
     return this.store;
   }
 
   get(key) {
     return this.store[key];
   }
+
+  _merge(settings) {
+    return Object.assign(DEFAULT_APP_SETTINGS, this.store, settings);
+  }
+
+  _hydrate() {
+    this.store = this._merge(readJsonSync(SETTINGS_PATH));
+    debug('Hydrate store', toJS(this.store));
+  }
+
+  _writeFile() {
+    outputJsonSync(SETTINGS_PATH, this.store);
+    debug('Write settings file', toJS(this.store));
+  }
 }
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 995b28fbd..3eab68a91 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,7 +1,11 @@
 import { ipcMain } from 'electron';
 
 export default (params) => {
-  ipcMain.on('settings', (event, args) => {
+  ipcMain.on('getAppSettings', () => {
+    params.mainWindow.webContents.send('appSettings', params.settings.all);
+  });
+
+  ipcMain.on('updateAppSettings', (event, args) => {
     params.settings.set(args);
   });
 };