Merge pull request oliverschwendener#407 from AmrBinBashir/fix-comman…

…dline-plugin-execution-pending fix commandline plugin execution pending
taktamur · May 26, 2020 · 414382d · 414382d
2 parents 7a74a89 + 7df9ee6
commit 414382d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/plugins/commandline-plugin/commandline-plugin.ts b/src/main/plugins/commandline-plugin/commandline-plugin.ts
@@ -6,21 +6,25 @@ import { TranslationSet } from "../../../common/translation/translation-set";
 import { defaultTerminalIcon } from "../../../common/icon/default-icons";
 import { CommandlineOptions } from "../../../common/config/commandline-options";
 import { WindowsShell, MacOsShell } from "./shells";
+import { Logger } from "../../../common/logger/logger";
 
 export class CommandlinePlugin implements ExecutionPlugin {
     public pluginType = PluginType.Commandline;
     private readonly commandlineExecutor: (command: string, shell: WindowsShell|MacOsShell) => Promise<void>;
     private config: CommandlineOptions;
     private translationSet: TranslationSet;
+    private readonly logger: Logger;
 
     constructor(
         config: CommandlineOptions,
         translationSet: TranslationSet,
         commandlineExecutor: (command: string, shell: WindowsShell|MacOsShell) => Promise<void>,
+        logger: Logger,
     ) {
         this.config = config;
         this.translationSet = translationSet;
         this.commandlineExecutor = commandlineExecutor;
+        this.logger = logger;
     }
 
     public isValidUserInput(userInput: string, fallback?: boolean | undefined): boolean {
@@ -49,7 +53,10 @@ export class CommandlinePlugin implements ExecutionPlugin {
     }
 
     public execute(searchResultItem: SearchResultItem, privileged: boolean): Promise<void> {
-        return this.commandlineExecutor(searchResultItem.executionArgument, this.config.shell);
+        this.commandlineExecutor(searchResultItem.executionArgument, this.config.shell)
+            .then(() => {/* do nothing */ })
+            .catch(error => this.logger.error(error));
+        return Promise.resolve();
     }
 
     public updateConfig(updatedConfig: UserConfigOptions, translationSet: TranslationSet): Promise<void> {

diff --git a/src/main/production/production-search-engine.ts b/src/main/production/production-search-engine.ts
@@ -146,7 +146,7 @@ export function getProductionSearchEngine(config: UserConfigOptions, translation
         new UrlPlugin(config.urlOptions, translationSet, urlExecutor),
         new EmailPlugin(config.emailOptions, translationSet, urlExecutor),
         new CurrencyConverterPlugin(config.currencyConverterOptions, translationSet, electronClipboardCopier),
-        new CommandlinePlugin(config.commandlineOptions, translationSet, commandlineExecutor),
+        new CommandlinePlugin(config.commandlineOptions, translationSet, commandlineExecutor, logger),
         new ColorConverterPlugin(config.colorConverterOptions, electronClipboardCopier),
         new DictionaryPlugin(config.dictionaryOptions, electronClipboardCopier, getGoogleDictionaryDefinitions),
     ];