uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use default configuration on dataModelVersion mismatch

Browse Source 
Closes #191
This commit is contained in:
Farkas József
2016-11-26 21:34:04 +01:00
parent 8efc3d371a
commit a70a5fada2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/store/storage/index.ts
View File

@@ -24,7 +24,7 @@ export class DataStorage {
} }
initialState(): AppState { initialState(): AppState {
let config: UhkConfiguration = this._environment.getConfig() || this.uhkConfiguration; const config: UhkConfiguration = this.getConfiguration();
return { return {
keymaps: { keymaps: {
entities: config.keymaps entities: config.keymaps
@@ -62,7 +62,7 @@ export class DataStorage {
(state.entities && state.entities.length && state.entities[0] instanceof Keymap) (state.entities && state.entities.length && state.entities[0] instanceof Keymap)
) )
) { ) {
config = this._environment.getConfig() || this.uhkConfiguration; config = this.getConfiguration();
config.keymaps = Object.values(nextState.entities); config.keymaps = Object.values(nextState.entities);
this._environment.saveConfig(config); this._environment.saveConfig(config);
} else if ( } else if (
@@ -72,7 +72,7 @@ export class DataStorage {
(state.entities && state.entities.length && state.entities[0] instanceof Macro) (state.entities && state.entities.length && state.entities[0] instanceof Macro)
) )
) { ) {
config = this._environment.getConfig() || this.uhkConfiguration; config = this.getConfiguration();
config.macros = Object.values(nextState.entities); config.macros = Object.values(nextState.entities);
this._environment.saveConfig(config); this._environment.saveConfig(config);
} }
@@ -83,6 +83,14 @@ export class DataStorage {
initUHKJson() { initUHKJson() {
this.uhkConfiguration = new UhkConfiguration().fromJsObject(require('json!../../config-serializer/uhk-config.json')); this.uhkConfiguration = new UhkConfiguration().fromJsObject(require('json!../../config-serializer/uhk-config.json'));
this.uhkPresets = (<any[]>require('json!../../config-serializer/preset-keymaps.json')) this.uhkPresets = (<any[]>require('json!../../config-serializer/preset-keymaps.json'))
.map(keymap => new Keymap().fromJsObject(keymap)); .map(keymap => new Keymap().fromJsObject(keymap));
}
getConfiguration(): UhkConfiguration {
let config: UhkConfiguration = this._environment.getConfig();
if (!config || config.dataModelVersion !== this.uhkConfiguration.dataModelVersion) {
config = this.uhkConfiguration;
}
return config;
} }
} }