Split settings into multiple stores; app specific settings are now stored in config file

1 files changed, 27 insertions, 14 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index b7d803398..b3f5d3eaf 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,12 +1,18 @@
 import { ipcRenderer } from 'electron';
-import { action, computed } from 'mobx';
+import { action, computed, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import { gaEvent } from '../lib/analytics';
 import SettingsModel from '../models/Settings';
+import Request from './lib/Request';
+import CachedRequest from './lib/CachedRequest';
+
+const debug = require('debug')('SettingsStore');
 
 export default class SettingsStore extends Store {
+  @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
+  @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
+
   constructor(...args) {
     super(...args);
 
@@ -15,22 +21,29 @@ export default class SettingsStore extends Store {
     this.actions.settings.remove.listen(this._remove.bind(this));
   }
 
-  setup() {
-    this._shareSettingsWithMainProcess();
-  }
-
   @computed get all() {
-    return new SettingsModel(localStorage.getItem('app') || {});
+    return new SettingsModel({
+      app: this.appSettingsRequest.execute().result || {},
+      service: localStorage.getItem('service') || {},
+      group: localStorage.getItem('group') || {},
+      stats: localStorage.getItem('stats') || {},
+    });
   }
 
-  @action async _update({ settings }) {
+  @action async _update({ type, data }) {
+    debug('Update settings', type, data, this.all);
     const appSettings = this.all;
-    localStorage.setItem('app', Object.assign(appSettings, settings));
-
-    // We need a little hack to wait until everything is patched
-    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
-
-    gaEvent('Settings', 'update');
+    if (type !== 'app') {
+      localStorage.setItem(type, Object.assign(appSettings[type], data));
+    } else {
+      debug('Store app settings on file system', type, data);
+      this.updateAppSettingsRequest.execute(data);
+
+      this.appSettingsRequest.patch((result) => {
+        if (!result) return;
+        Object.assign(result, data);
+      });
+    }
   }
 
   @action async _remove({ key }) {