6 files changed, 85 insertions, 22 deletions

diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index b3138e948..6ac3b9177 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,15 +1,21 @@
 import { observable, toJS } from 'mobx';
 import { pathExistsSync, outputJsonSync, readJsonSync } from 'fs-extra';
+import path from 'path';
 
-import { SETTINGS_PATH, DEFAULT_APP_SETTINGS } from '../config';
+import { SETTINGS_PATH } from '../config';
 
-const debug = require('debug')('Settings');
+const debug = require('debug')('Franz:Settings');
 
 export default class Settings {
-  @observable store = DEFAULT_APP_SETTINGS;
+  type = '';
+  @observable store = {};
 
-  constructor() {
-    if (!pathExistsSync(SETTINGS_PATH)) {
+  constructor(type, defaultState = {}) {
+    this.type = type;
+    this.store = defaultState;
+    this.defaultState = defaultState;
+
+    if (!pathExistsSync(this.settingsFile)) {
       this._writeFile();
     } else {
       this._hydrate();
@@ -17,7 +23,7 @@ export default class Settings {
   }
 
   set(settings) {
-    this.store = Object.assign(this.store, settings);
+    this.store = this._merge(settings);
 
     this._writeFile();
   }
@@ -30,13 +36,21 @@ export default class Settings {
     return this.store[key];
   }
 
+  _merge(settings) {
+    return Object.assign(this.defaultState, this.store, settings);
+  }
+
   _hydrate() {
-    this.store = readJsonSync(SETTINGS_PATH);
+    this.store = this._merge(readJsonSync(this.settingsFile));
     debug('Hydrate store', toJS(this.store));
   }
 
   _writeFile() {
-    outputJsonSync(SETTINGS_PATH, this.store);
+    outputJsonSync(this.settingsFile, this.store);
     debug('Write settings file', toJS(this.store));
   }
+
+  get settingsFile() {
+    return path.join(SETTINGS_PATH, `${this.type === 'app' ? 'settings' : this.type}.json`);
+  }
 }
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index d31819068..e568bf35d 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -15,7 +15,7 @@ function getAsset(type, asset) {
 
 export default (params) => {
   autorun(() => {
-    isTrayIconEnabled = params.settings.get('enableSystemTray');
+    isTrayIconEnabled = params.settings.app.get('enableSystemTray');
 
     if (!isTrayIconEnabled) {
       params.trayIcon.hide();
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index ba49a2f97..9ccc89ea2 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -1,17 +1,17 @@
 import { app, ipcMain } from 'electron';
 import { autoUpdater } from 'electron-updater';
-import { isDevMode } from '../../environment.js';
+
+const debug = require('debug')('Franz:ipcApi:autoUpdate');
 
 export default (params) => {
-  if (!isDevMode && (process.platform === 'darwin' || process.platform === 'win32')) {
-    // autoUpdater.setFeedURL(updateUrl);
+  if (process.platform === 'darwin' || process.platform === 'win32') {
     ipcMain.on('autoUpdate', (event, args) => {
       try {
-        autoUpdater.allowPrerelease = Boolean(params.settings.get('beta'));
+        autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta'));
         if (args.action === 'check') {
           autoUpdater.checkForUpdates();
         } else if (args.action === 'install') {
-          console.log('install update');
+          debug('install update');
           autoUpdater.quitAndInstall();
           // we need to send a quit event
           setTimeout(() => {
@@ -25,12 +25,12 @@ export default (params) => {
     });
 
     autoUpdater.on('update-not-available', () => {
-      console.log('update-not-available');
+      debug('update-not-available');
       params.mainWindow.webContents.send('autoUpdate', { available: false });
     });
 
     autoUpdater.on('update-available', () => {
-      console.log('update-available');
+      debug('update-available');
       params.mainWindow.webContents.send('autoUpdate', { available: true });
     });
 
@@ -39,16 +39,16 @@ export default (params) => {
       logMessage = `${logMessage} - Downloaded ${progressObj.percent}%`;
       logMessage = `${logMessage} (${progressObj.transferred}/${progressObj.total})`;
 
-      console.log(logMessage);
+      debug(logMessage);
     });
 
     autoUpdater.on('update-downloaded', () => {
-      console.log('update-downloaded');
+      debug('update-downloaded');
       params.mainWindow.webContents.send('autoUpdate', { downloaded: true });
     });
 
     autoUpdater.on('error', () => {
-      console.log('update-error');
+      debug('update-error');
       params.mainWindow.webContents.send('autoUpdate', { error: true });
     });
   }
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
new file mode 100644
index 000000000..9e504834d
--- /dev/null
+++ b/src/electron/ipc-api/download.js
@@ -0,0 +1,43 @@
+import { ipcMain, dialog } from 'electron';
+import { download } from 'electron-dl';
+import mime from 'mime-types';
+import fs from 'fs-extra';
+
+const debug = require('debug')('Franz:ipcApi:download');
+
+function decodeBase64Image(dataString) {
+  const matches = dataString.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
+
+  if (matches.length !== 3) {
+    return new Error('Invalid input string');
+  }
+
+  return new Buffer(matches[2], 'base64');
+}
+
+export default (params) => {
+  ipcMain.on('download-file', async (event, { url, content, fileOptions = {} }) => {
+    try {
+      if (!content) {
+        const dl = await download(params.mainWindow, url, {
+          saveAs: true,
+        });
+        debug('File saved to', dl.getSavePath());
+      } else {
+        const extension = mime.extension(fileOptions.mime);
+        const filename = `${fileOptions.name}.${extension}`;
+
+        dialog.showSaveDialog(params.mainWindow, {
+          defaultPath: filename,
+        }, (name) => {
+          const binaryImage = decodeBase64Image(content);
+          fs.writeFileSync(name, binaryImage, 'binary');
+
+          debug('File blob saved to', name);
+        });
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  });
+};
diff --git a/src/electron/ipc-api/index.js b/src/electron/ipc-api/index.js
index 4ea6d1475..be8e0815a 100644
--- a/src/electron/ipc-api/index.js
+++ b/src/electron/ipc-api/index.js
@@ -1,9 +1,11 @@
 import autoUpdate from './autoUpdate';
 import settings from './settings';
 import appIndicator from './appIndicator';
+import download from './download';
 
 export default (params) => {
   settings(params);
   autoUpdate(params);
   appIndicator(params);
+  download(params);
 };
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 3eab68a91..ce006bb92 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,11 +1,15 @@
 import { ipcMain } from 'electron';
 
 export default (params) => {
-  ipcMain.on('getAppSettings', () => {
-    params.mainWindow.webContents.send('appSettings', params.settings.all);
+  ipcMain.on('getAppSettings', (event, type) => {
+    console.log('getAppSettings', type, params.settings[type].all);
+    params.mainWindow.webContents.send('appSettings', {
+      type,
+      data: params.settings[type].all,
+    });
   });
 
   ipcMain.on('updateAppSettings', (event, args) => {
-    params.settings.set(args);
+    params.settings[args.type].set(args.data);
   });
 };