Renamed ConfigOptions to UserConfigOptions

oliverschwendener · Sep 23, 2018 · 789d800 · 789d800
1 parent 274dc0e
commit 789d800
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 60 deletions.
diff --git a/src/tests/integration/config-file-repository.test.ts b/src/tests/integration/config-file-repository.test.ts
@@ -1,7 +1,7 @@
 import * as fs from "fs";
-import { ConfigFileRepository } from "../../ts/config-file-repository";
+import { UserConfigFileRepository } from "../../ts/user-config/config-file-repository";
 import { WebSearch } from "../../ts/web-search";
-import { ConfigOptions } from "../../ts/config-options";
+import { UserConfigOptions } from "../../ts/user-config/config-options";
 
 const defaultConfig = {
     webSearches: [
@@ -18,7 +18,7 @@ const defaultConfig = {
             url: "https://dummy-search-2.com/query=",
         },
     ],
-} as ConfigOptions;
+} as UserConfigOptions;
 
 const fakeUserConfig = {
     webSearches: [
@@ -29,14 +29,14 @@ const fakeUserConfig = {
             url: "https://custom-user-search.com/query=",
         },
     ],
-} as ConfigOptions;
+} as UserConfigOptions;
 
-describe(ConfigFileRepository.name, (): void => {
+describe(UserConfigFileRepository.name, (): void => {
     const notExistingConfigFile = "./does-not-exist";
 
     describe("getConfig", (): void => {
         it("loads default config and creates default config file when user config file does not exist", (): void => {
-            const actual = new ConfigFileRepository(defaultConfig, notExistingConfigFile).getConfig();
+            const actual = new UserConfigFileRepository(defaultConfig, notExistingConfigFile).getConfig();
 
             expect(actual.webSearches.length).toBe(defaultConfig.webSearches.length);
 
@@ -52,7 +52,7 @@ describe(ConfigFileRepository.name, (): void => {
             }
 
             const configFileContent = fs.readFileSync(notExistingConfigFile, "utf-8");
-            const configFromFile = JSON.parse(configFileContent) as ConfigOptions;
+            const configFromFile = JSON.parse(configFileContent) as UserConfigOptions;
 
             for (const webSearch of configFromFile.webSearches) {
                 const defaultWebSearch = defaultConfig.webSearches.filter((w: WebSearch): boolean => {
@@ -75,7 +75,7 @@ describe(ConfigFileRepository.name, (): void => {
         const fakeUserConfigFilePath = "./fake-user-config.json";
 
         it("loads user config when user config is available", (): void => {
-            const actual = new ConfigFileRepository(defaultConfig, fakeUserConfigFilePath).getConfig();
+            const actual = new UserConfigFileRepository(defaultConfig, fakeUserConfigFilePath).getConfig();
             expect(actual.webSearches.length).toBe(fakeUserConfig.webSearches.length);
 
             for (const webSearch of actual.webSearches) {
@@ -104,7 +104,7 @@ describe(ConfigFileRepository.name, (): void => {
         const config = "<html>This is invalid json</hmtl>";
 
         it("should return default config if an error occurs when reading config file", (): void => {
-            const actual = new ConfigFileRepository(defaultConfig, configFilePath).getConfig();
+            const actual = new UserConfigFileRepository(defaultConfig, configFilePath).getConfig();
 
             expect(actual.webSearches.length).toBe(defaultConfig.webSearches.length);
 

diff --git a/src/tests/integration/execution-argument-validator-executor-combination-manager.test.ts b/src/tests/integration/execution-argument-validator-executor-combination-manager.test.ts
@@ -6,13 +6,13 @@ import { MacOsSettingsExecutionArgumentValidator } from "../../ts/execution-argu
 import { MacOsSettingsExecutor } from "../../ts/executors/mac-os-settings-executor";
 import { OperatingSystemHelpers } from "../../ts/helpers/operating-system-helpers";
 import { OperatingSystem } from "../../ts/operating-system";
-import { ConfigOptions } from "../../ts/config-options";
+import { UserConfigOptions } from "../../ts/user-config/config-options";
 
 describe(ExecutionArgumentValidatorExecutorCombinationManager.name, (): void => {
     it("should return the correct execution argument valiator executor combinations", (): void => {
         let counter = 0;
 
-        const testConfig = {} as ConfigOptions;
+        const testConfig = {} as UserConfigOptions;
 
         const combinations = new ExecutionArgumentValidatorExecutorCombinationManager(testConfig).getCombinations();
 

diff --git a/src/tests/unit/execution-service.test.ts b/src/tests/unit/execution-service.test.ts
@@ -2,7 +2,7 @@ import { ExecutionService } from "../../ts/execution-service";
 import { ExecutionArgumentValidatorExecutorCombination } from "../../ts/execution-argument-validator-executor-combination";
 import { CountManager } from "../../ts/count-manager";
 import { FakeCountRepository } from "./fake-count-repository";
-import { ConfigOptions } from "../../ts/config-options";
+import { UserConfigOptions } from "../../ts/user-config/config-options";
 import { FakeExecutor } from "./fake-executor";
 import { FakeExecutionArgumentValidator } from "./fake-execution-argument-validator";
 import { FakeIpcEmitter } from "./fake-ipc-emitter";
@@ -29,7 +29,7 @@ describe(ExecutionService.name, (): void => {
             ] as ExecutionArgumentValidatorExecutorCombination[];
 
             const countManager = new CountManager(new FakeCountRepository({}));
-            const config = { logExecution } as ConfigOptions;
+            const config = { logExecution } as UserConfigOptions;
             const ipcEmitter = new FakeIpcEmitter();
             const executionService = new ExecutionService(combinations, countManager, config, ipcEmitter);
 
@@ -59,7 +59,7 @@ describe(ExecutionService.name, (): void => {
             ] as ExecutionArgumentValidatorExecutorCombination[];
 
             const countManager = new CountManager(new FakeCountRepository({}));
-            const config = { logExecution } as ConfigOptions;
+            const config = { logExecution } as UserConfigOptions;
             const ipcEmitter = new FakeIpcEmitter();
             const executionService = new ExecutionService(combinations, countManager, config, ipcEmitter);
 
@@ -84,7 +84,7 @@ describe(ExecutionService.name, (): void => {
             ] as ExecutionArgumentValidatorExecutorCombination[];
 
             const countManager = new CountManager(new FakeCountRepository({}));
-            const config = { logExecution } as ConfigOptions;
+            const config = { logExecution } as UserConfigOptions;
             const ipcEmitter = new FakeIpcEmitter();
             const executionService = new ExecutionService(combinations, countManager, config, ipcEmitter);
 
@@ -108,7 +108,7 @@ describe(ExecutionService.name, (): void => {
             ] as ExecutionArgumentValidatorExecutorCombination[];
 
             const countManager = new CountManager(new FakeCountRepository({}));
-            const config = { logExecution } as ConfigOptions;
+            const config = { logExecution } as UserConfigOptions;
             const ipcEmitter = new FakeIpcEmitter();
             const executionService = new ExecutionService(combinations, countManager, config, ipcEmitter);
 
@@ -132,7 +132,7 @@ describe(ExecutionService.name, (): void => {
             ] as ExecutionArgumentValidatorExecutorCombination[];
 
             const countManager = new CountManager(new FakeCountRepository({}));
-            const config = { logExecution } as ConfigOptions;
+            const config = { logExecution } as UserConfigOptions;
             const ipcEmitter = new FakeIpcEmitter();
             const executionService = new ExecutionService(combinations, countManager, config, ipcEmitter);
 

diff --git a/src/tests/unit/input-validation-service.test.ts b/src/tests/unit/input-validation-service.test.ts
@@ -2,14 +2,14 @@ import { InputValidationService } from "../../ts/input-validation-service";
 import { FakeSearcher } from "./fake-searcher";
 import { FakeInputValidator } from "./fake-input-validator";
 import { SearchResultItem } from "../../ts/search-result-item";
-import { ConfigOptions } from "../../ts/config-options";
+import { UserConfigOptions } from "../../ts/user-config/config-options";
 import { WebSearch } from "../../ts/web-search";
 import { WebSearchBuilder } from "../../ts/builders/web-search-builder";
 
 describe(InputValidationService.name, (): void => {
     const config = {
         fallbackWebSearches: [] as string[],
-    } as ConfigOptions;
+    } as UserConfigOptions;
 
     describe("getSearchResults", () => {
         it("should return an empty array if user input is an empty string, undefined or null", (): void => {

diff --git a/src/ts/default-config.ts b/src/ts/default-config.ts
@@ -1,12 +1,12 @@
-import { ConfigOptions } from "./config-options";
+import { UserConfigOptions } from "./user-config/config-options";
 import { OperatingSystemHelpers } from "./helpers/operating-system-helpers";
 import { homedir, platform } from "os";
 import { OperatingSystem } from "./operating-system";
 import { WebSearch } from "./web-search";
 
 const currentOperatingSystem = OperatingSystemHelpers.getOperatingSystemFromString(platform());
 
-export const defaultConfig: ConfigOptions = {
+export const defaultConfig: UserConfigOptions = {
     allowMouseInteraction: true,
     alwaysShowOnPrimaryDisplay: false,
     applicationFileExtensions: currentOperatingSystem === OperatingSystem.Windows

diff --git a/src/ts/execution-argument-validator-executor-combination-manager.ts b/src/ts/execution-argument-validator-executor-combination-manager.ts
@@ -17,7 +17,7 @@ import { WindowsSettingsExecutionArgumentValidator } from "./execution-argument-
 import { WindowsSettingsExecutor } from "./executors/windows-settings-executor";
 import { MacOsSettingsExecutor } from "./executors/mac-os-settings-executor";
 import { MacOsSettingsExecutionArgumentValidator } from "./execution-argument-validators/mac-os-execution-argument-validator";
-import { ConfigOptions } from "./config-options";
+import { UserConfigOptions } from "./user-config/config-options";
 import { CustomCommandExecutor } from "./executors/custom-command-executor";
 import { ShortcutExecutionArgumentValidator } from "./execution-argument-validators/shortcut-execution-argument-validator";
 import { CalculatorExecutor } from "./executors/calculator-executor";
@@ -26,7 +26,7 @@ import { CalculatorExecutionArgumentValidator } from "./execution-argument-valid
 export class ExecutionArgumentValidatorExecutorCombinationManager {
     private combinations: ExecutionArgumentValidatorExecutorCombination[];
 
-    constructor(config: ConfigOptions) {
+    constructor(config: UserConfigOptions) {
         this.combinations = [
             {
                 executor: new CommandLineExecutor(),

diff --git a/src/ts/execution-service.ts b/src/ts/execution-service.ts
@@ -1,15 +1,15 @@
 import { ExecutionArgumentValidatorExecutorCombination } from "./execution-argument-validator-executor-combination";
 import { CountManager } from "./count-manager";
-import { ConfigOptions } from "./config-options";
+import { UserConfigOptions } from "./user-config/config-options";
 import { IpcEmitter } from "./ipc-emitter";
 
 export class ExecutionService {
     private validatorExecutorCombinations: ExecutionArgumentValidatorExecutorCombination[];
     private countManager: CountManager;
-    private config: ConfigOptions;
+    private config: UserConfigOptions;
     private ipcEmitter: IpcEmitter;
 
-    public constructor(validatorExecutorCombinations: ExecutionArgumentValidatorExecutorCombination[], countManager: CountManager, config: ConfigOptions, ipcEmitter: IpcEmitter) {
+    public constructor(validatorExecutorCombinations: ExecutionArgumentValidatorExecutorCombination[], countManager: CountManager, config: UserConfigOptions, ipcEmitter: IpcEmitter) {
         this.config = config;
         this.validatorExecutorCombinations = validatorExecutorCombinations;
         this.countManager = countManager;

diff --git a/src/ts/input-validation-service.ts b/src/ts/input-validation-service.ts
@@ -2,13 +2,13 @@ import { StringHelpers } from "./helpers/string-helpers";
 import { SearchResultItem } from "./search-result-item";
 import { InputValidatorSearcherCombination } from "./input-validator-searcher-combination";
 import { FallbackWebSearchSercher } from "./searcher/fallback-web-search-searcher";
-import { ConfigOptions } from "./config-options";
+import { UserConfigOptions } from "./user-config/config-options";
 
 export class InputValidationService {
-    private configOptions: ConfigOptions;
+    private configOptions: UserConfigOptions;
     private validatorSearcherCombinations: InputValidatorSearcherCombination[];
 
-    public constructor(configOptions: ConfigOptions, validatorSearcherCombinations: InputValidatorSearcherCombination[]) {
+    public constructor(configOptions: UserConfigOptions, validatorSearcherCombinations: InputValidatorSearcherCombination[]) {
         this.configOptions = configOptions;
         this.validatorSearcherCombinations = validatorSearcherCombinations;
     }

diff --git a/src/ts/input-validator-searcher-combination-manager.ts b/src/ts/input-validator-searcher-combination-manager.ts
@@ -14,7 +14,7 @@ import { SearchPluginsSearcher } from "./searcher/search-plugins-searcher";
 import { SearchPluginsInputValidator } from "./input-validators/search-plugins-input-validator";
 import { InputValidatorSearcherCombination } from "./input-validator-searcher-combination";
 import { UeliHelpers } from "./helpers/ueli-helpers";
-import { ConfigOptions } from "./config-options";
+import { UserConfigOptions } from "./user-config/config-options";
 import { CountManager } from "./count-manager";
 import { CountFileRepository } from "./count-file-repository";
 import { Injector } from "./injector";
@@ -25,7 +25,7 @@ import { CustomCommandInputValidator } from "./input-validators/custom-command-i
 export class InputValidatorSearcherCombinationManager {
     private combinations: InputValidatorSearcherCombination[];
 
-    constructor(config: ConfigOptions) {
+    constructor(config: UserConfigOptions) {
         const iconSet = Injector.getIconSet(platform());
         const countManager = new CountManager(new CountFileRepository(UeliHelpers.countFilePath));
         const environmentVariableCollection = process.env as { [key: string]: string };

diff --git a/src/ts/main.ts b/src/ts/main.ts
@@ -14,23 +14,23 @@ import { ExecutionArgumentValidatorExecutorCombinationManager } from "./executio
 import { InputValidatorSearcherCombinationManager } from "./input-validator-searcher-combination-manager";
 import { UeliHelpers } from "./helpers/ueli-helpers";
 import { defaultConfig } from "./default-config";
-import { ConfigFileRepository } from "./config-file-repository";
+import { UserConfigFileRepository } from "./user-config/config-file-repository";
 import { CountManager } from "./count-manager";
 import { CountFileRepository } from "./count-file-repository";
 import { ProductionIpcEmitter } from "./production-ipc-emitter";
 import { AutoCompletionService } from "./auto-completion/autocompletion-service";
 import { FilePathAutoCompletionValidator } from "./auto-completion/file-path-autocompletion-validator";
 import { ElectronStoreAppConfigRepository } from "./app-config/electorn-store-app-config-repository";
 import { AppConfig } from "./app-config/app-config";
-import { ConfigOptions } from "./config-options";
+import { UserConfigOptions } from "./user-config/config-options";
 
 let mainWindow: BrowserWindow;
 let trayIcon: Tray;
 
 const delayWhenHidingCommandlineOutputInMs = 25;
 const filePathExecutor = new FilePathExecutor();
 const appConfigRepository = new ElectronStoreAppConfigRepository();
-const userConfigRepository = new ConfigFileRepository(defaultConfig, appConfigRepository.getAppConfig().userSettingsFilePath);
+const userConfigRepository = new UserConfigFileRepository(defaultConfig, appConfigRepository.getAppConfig().userSettingsFilePath);
 let config = userConfigRepository.getConfig();
 let inputValidationService = new InputValidationService(config, new InputValidatorSearcherCombinationManager(config).getCombinations());
 const ipcEmitter = new ProductionIpcEmitter();
@@ -181,7 +181,7 @@ function hideMainWindow(): void {
 }
 
 function reloadApp(preventMainWindowReload?: boolean): void {
-    config = new ConfigFileRepository(defaultConfig, appConfigRepository.getAppConfig().userSettingsFilePath).getConfig();
+    config = new UserConfigFileRepository(defaultConfig, appConfigRepository.getAppConfig().userSettingsFilePath).getConfig();
     inputValidationService = new InputValidationService(config, new InputValidatorSearcherCombinationManager(config).getCombinations());
     executionService = new ExecutionService(
         new ExecutionArgumentValidatorExecutorCombinationManager(config).getCombinations(),
@@ -279,7 +279,7 @@ ipcMain.on(IpcChannels.updateAppConfig, (event: Electron.Event, updatedAppConfig
     appConfigRepository.setAppConfig(updatedAppConfig);
 });
 
-ipcMain.on(IpcChannels.updateUserConfig, (event: Electron.Event, updatedUserConfig: ConfigOptions) => {
+ipcMain.on(IpcChannels.updateUserConfig, (event: Electron.Event, updatedUserConfig: UserConfigOptions) => {
     config = updatedUserConfig;
     userConfigRepository.saveConfig(updatedUserConfig);
     reloadApp(true);

diff --git a/src/ts/renderer.ts b/src/ts/renderer.ts
@@ -2,7 +2,7 @@ import { SearchResultItemViewModel } from "./search-result-item-view-model";
 import { IpcChannels } from "./ipc-channels";
 import { platform } from "os";
 import { ipcRenderer } from "electron";
-import { ConfigFileRepository } from "./config-file-repository";
+import { UserConfigFileRepository } from "./user-config/config-file-repository";
 import { defaultConfig } from "./default-config";
 import { UserInputHistoryManager } from "./user-input-history-manager";
 import { Injector } from "./injector";
@@ -16,7 +16,7 @@ import { WebSearch } from "./web-search";
 import * as packageJson from "../../package.json";
 
 const appConfigRepository = new ElectronStoreAppConfigRepository();
-const config = new ConfigFileRepository(defaultConfig, appConfigRepository.getAppConfig().userSettingsFilePath).getConfig();
+const config = new UserConfigFileRepository(defaultConfig, appConfigRepository.getAppConfig().userSettingsFilePath).getConfig();
 const configEdit = {
     newApplicationFileExtension: "",
     newApplicationFolder: "",

diff --git a/src/ts/search-plugin-manager.ts b/src/ts/search-plugin-manager.ts
@@ -5,15 +5,15 @@ import { ProgramsPlugin } from "./search-plugins/programs-plugin";
 import { SearchPlugin } from "./search-plugins/search-plugin";
 import { platform } from "os";
 import { ProgramFileRepository } from "./programs-plugin/program-file-repository";
-import { ConfigOptions } from "./config-options";
+import { UserConfigOptions } from "./user-config/config-options";
 import { ShortcutsPlugin } from "./search-plugins/shortcuts-plugin";
 import { IconSet } from "./icon-sets/icon-set";
 import { EnvironmentVariablePlugin } from "./search-plugins/environment-variable-plugin";
 
 export class SearchPluginManager {
     private plugins: SearchPlugin[];
 
-    public constructor(config: ConfigOptions, iconSet: IconSet, environmentVariableCollection: { [key: string]: string }) {
+    public constructor(config: UserConfigOptions, iconSet: IconSet, environmentVariableCollection: { [key: string]: string }) {
         this.plugins = [
             new ProgramsPlugin(new ProgramFileRepository(config.applicationFolders, config.applicationFileExtensions)),
             new FileSearchPlugin(config.fileSearchOptions),

diff --git a/src/ts/searcher/file-path-searcher.ts b/src/ts/searcher/file-path-searcher.ts
@@ -6,14 +6,14 @@ import { SearchEngine } from "../search-engine";
 import { SearchResultItem } from "../search-result-item";
 import { Searcher } from "./searcher";
 import { platform } from "os";
-import { ConfigOptions } from "../config-options";
+import { UserConfigOptions } from "../user-config/config-options";
 import { FilePathDescriptionBuilder } from "../builders/file-path-description-builder";
 
 export class FilePathSearcher implements Searcher {
     private iconSet = Injector.getIconSet(platform());
-    private config: ConfigOptions;
+    private config: UserConfigOptions;
 
-    constructor(config: ConfigOptions) {
+    constructor(config: UserConfigOptions) {
         this.config = config;
     }