Add base and override config

This commit is contained in:
Jarred Witt
2017-09-07 12:00:02 -07:00
committed by David Meza
parent 98077784ec
commit 0efe676a8e
4 changed files with 59 additions and 23 deletions

View File

@@ -0,0 +1,28 @@
{
"default": {
"teams": [],
"showTrayIcon": false,
"trayIconTheme": "light",
"minimizeToTray": false,
"version": "1",
"notifications": {
"flashWindow": 0
},
"showUnreadBadge": true,
"useSpellChecker": true,
"spellCheckerLocale": "en-US"
},
"1": {
"teams": [],
"showTrayIcon": false,
"trayIconTheme": "light",
"minimizeToTray": false,
"version": "1",
"notifications": {
"flashWindow": 0
},
"showUnreadBadge": true,
"useSpellChecker": true,
"spellCheckerLocale": "en-US"
}
}

View File

@@ -0,0 +1,3 @@
{
}

View File

@@ -1,39 +1,38 @@
'use strict'; 'use strict';
const fs = require('fs'); const fs = require('fs');
const deepmerge = require('deepmerge').default;
const settingsVersion = 1; const settingsVersion = 1;
const baseConfig = require('./config/base.json');
const overrideConfig = require('./config/override.json');
function merge(base, target) { function merge(base, target) {
return Object.assign({}, base, target); return Object.assign({}, base, target);
} }
function deepMergeArray(dest) {
return dest;
}
function loadDefault(version, spellCheckerLocale) { function loadDefault(version, spellCheckerLocale) {
var ver = version; var ver = version;
if (version == null) { if (version == null) {
ver = settingsVersion; ver = settingsVersion;
} }
switch (ver) {
case 1: const base = baseConfig[ver] || baseConfig.default;
return { const override = overrideConfig[ver] || {};
teams: [],
showTrayIcon: false, const defaults = deepmerge(base, override, {clone: true, arrayMerge: deepMergeArray});
trayIconTheme: 'light',
minimizeToTray: false, return Object.assign(defaults, {
version: 1, spellCheckerLocale: spellCheckerLocale || defaults.spellCheckerLocale || 'en-US'
notifications: { });
flashWindow: 0 // 0 = flash never, 1 = only when idle (after 10 seconds), 2 = always
},
showUnreadBadge: true,
useSpellChecker: true,
spellCheckerLocale: spellCheckerLocale || 'en-US'
};
default:
return {};
}
} }
function upgradeV0toV1(configV0) { function upgradeV0toV1(configV0) {
var config = loadDefault(1); var config = loadDefault('1');
config.teams.push({ config.teams.push({
name: 'Primary team', name: 'Primary team',
url: configV0.url url: configV0.url
@@ -42,7 +41,7 @@ function upgradeV0toV1(configV0) {
} }
function upgrade(config, newAppVersion) { function upgrade(config, newAppVersion) {
var configVersion = config.version ? config.version : 0; var configVersion = config.version ? config.version : '1';
if (newAppVersion) { if (newAppVersion) {
config.lastMattermostVersion = newAppVersion; config.lastMattermostVersion = newAppVersion;
} }
@@ -61,15 +60,19 @@ module.exports = {
readFileSync(configFile) { readFileSync(configFile) {
var config = JSON.parse(fs.readFileSync(configFile, 'utf8')); var config = JSON.parse(fs.readFileSync(configFile, 'utf8'));
if (config.version === settingsVersion) {
// need to be able to compare 1 to '1'
if (config.version == settingsVersion) { // eslint-disable-line
var defaultConfig = this.loadDefault(); var defaultConfig = this.loadDefault();
config = merge(defaultConfig, config); config = merge(defaultConfig, config);
} }
return config; return config;
}, },
writeFile(configFile, config, callback) { writeFile(configFile, config, callback) {
if (config.version !== settingsVersion) { // need to be able to compare 1 to '1'
if (config.version != settingsVersion) { // eslint-disable-line
throw new Error('version ' + config.version + ' is not equal to ' + settingsVersion); throw new Error('version ' + config.version + ' is not equal to ' + settingsVersion);
} }
var data = JSON.stringify(config, null, ' '); var data = JSON.stringify(config, null, ' ');
@@ -77,7 +80,8 @@ module.exports = {
}, },
writeFileSync(configFile, config) { writeFileSync(configFile, config) {
if (config.version !== settingsVersion) { // need to be able to compare 1 to '1'
if (config.version != settingsVersion) { // eslint-disable-line
throw new Error('version ' + config.version + ' is not equal to ' + settingsVersion); throw new Error('version ' + config.version + ' is not equal to ' + settingsVersion);
} }
var data = JSON.stringify(config, null, ' '); var data = JSON.stringify(config, null, ' ');

View File

@@ -12,6 +12,7 @@
"auto-launch": "^5.0.1", "auto-launch": "^5.0.1",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"create-react-class": "^15.5.3", "create-react-class": "^15.5.3",
"deepmerge": "^1.5.1",
"electron-context-menu": "^0.9.0", "electron-context-menu": "^0.9.0",
"electron-devtools-installer": "^2.2.0", "electron-devtools-installer": "^2.2.0",
"electron-is-dev": "^0.1.2", "electron-is-dev": "^0.1.2",