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

Separate hardware configuration from user configuration

Browse Source 
Closes #152
This commit is contained in:
Farkas József
2017-01-01 10:44:20 +01:00
parent 52fd854e92
commit a377bcf3b4
9 changed files with 108 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/store/storage/electron.ts
View File

@@ -1,13 +1,13 @@
import { UhkConfiguration } from '../../config-serializer/config-items/UhkConfiguration';
import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration';
export class Electron {
getConfig(): UhkConfiguration {
getConfig(): UserConfiguration {
// TODO implement load logic
return;
}
/* tslint:disable:no-unused-variable */
saveConfig(config: UhkConfiguration): void {
saveConfig(config: UserConfiguration): void {
// TODO implement save logic
}
}

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

@@ -4,7 +4,7 @@ import { Action } from '@ngrx/store';
import { Keymap } from '../../config-serializer/config-items/Keymap';
import { Macro } from '../../config-serializer/config-items/Macro';
import { UhkConfiguration } from '../../config-serializer/config-items/UhkConfiguration';
import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration';
import { KeymapActions, MacroActions } from '../actions';
import { AppState } from '../index';
@@ -15,7 +15,7 @@ import { Local } from './local';
export class DataStorage {
private _environment: Local | Electron;
private uhkConfiguration: UhkConfiguration;
private defaultUserConfiguration: UserConfiguration;
private uhkPresets: Keymap[];
constructor() {
@@ -24,7 +24,7 @@ export class DataStorage {
}
initialState(): AppState {
const config: UhkConfiguration = this.getConfiguration();
const config: UserConfiguration = this.getConfiguration();
return {
keymaps: {
entities: config.keymaps
@@ -44,7 +44,7 @@ export class DataStorage {
}
// Local storage
else {
this._environment = new Local(this.uhkConfiguration.dataModelVersion);
this._environment = new Local(this.defaultUserConfiguration.dataModelVersion);
}
}
@@ -52,7 +52,7 @@ export class DataStorage {
saveState(reducer: any): (state: any, action: Action) => AppState {
return (state: any, action: Action) => {
let nextState = reducer(state, action);
let config: UhkConfiguration;
let config: UserConfiguration;
// Save elements to the UhkConfiguration
if (
@@ -81,15 +81,16 @@ export class DataStorage {
}
initUHKJson() {
this.uhkConfiguration = new UhkConfiguration().fromJsonObject(require('json!../../config-serializer/uhk-config.json'));
this.defaultUserConfiguration = new UserConfiguration()
.fromJsonObject(require('json!../../config-serializer/user-config.json'));
this.uhkPresets = (<any[]>require('json!../../config-serializer/preset-keymaps.json'))
.map(keymap => new Keymap().fromJsonObject(keymap));
}
getConfiguration(): UhkConfiguration {
let config: UhkConfiguration = this._environment.getConfig();
getConfiguration(): UserConfiguration {
let config: UserConfiguration = this._environment.getConfig();
if (!config) {
config = this.uhkConfiguration;
config = this.defaultUserConfiguration;
}
return config;
}

10
src/store/storage/local.ts
View File

@@ -1,24 +1,24 @@
import { UhkConfiguration } from '../../config-serializer/config-items/UhkConfiguration';
import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration';
export class Local {
constructor(private dataModelVersion: number) { }
getConfig(): UhkConfiguration {
getConfig(): UserConfiguration {
let configJsonString = localStorage.getItem('config');
let config: UhkConfiguration;
let config: UserConfiguration;
if (configJsonString) {
const configJsonObject = JSON.parse(configJsonString);
if (configJsonObject.dataModelVersion === this.dataModelVersion) {
config = new UhkConfiguration().fromJsonObject(configJsonObject);
config = new UserConfiguration().fromJsonObject(configJsonObject);
}
}
return config;
}
saveConfig(config: UhkConfiguration): void {
saveConfig(config: UserConfiguration): void {
localStorage.setItem('config', JSON.stringify(config.toJsonObject()));
}
}