From 0227b9591c9ceb57897b34201932e0454ad10eef Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Tue, 13 Dec 2022 19:02:27 +0800 Subject: [PATCH 1/4] Fix open with editor for files of which path contains blank --- Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs index 522286524..312ea3339 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -322,7 +322,7 @@ namespace Flow.Launcher.Plugin.Explorer { try { - Process.Start(editorPath, record.FullPath); + Process.Start(editorPath, '"' + record.FullPath + '"'); return true; } catch (Exception e) From fb77d42395352e2bb9f88fc57c168c4c680b17b1 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Tue, 13 Dec 2022 19:47:05 +0800 Subject: [PATCH 2/4] Make error message translatable --- Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 6 ++++-- Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs index 312ea3339..0c9b78ca8 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -327,7 +327,8 @@ namespace Flow.Launcher.Plugin.Explorer } catch (Exception e) { - var message = $"Failed to open editor for file at {record.FullPath} with Editor {Path.GetFileNameWithoutExtension(editorPath)} at {editorPath}"; + var raw_message = Context.API.GetTranslation("plugin_explorer_openwitheditor_error"); + var message = string.Format(raw_message, record.FullPath, Path.GetFileNameWithoutExtension(editorPath), editorPath); LogException(message, e); Context.API.ShowMsgError(message); return false; @@ -358,7 +359,8 @@ namespace Flow.Launcher.Plugin.Explorer } catch (Exception e) { - var message = $"Failed to open editor for file at {record.FullPath} with Shell {Path.GetFileNameWithoutExtension(shellPath)} at {shellPath}"; + var raw_message = Context.API.GetTranslation("plugin_explorer_openwithshell_error"); + var message = string.Format(raw_message, record.FullPath, Path.GetFileNameWithoutExtension(shellPath), shellPath); LogException(message, e); Context.API.ShowMsgError(message); return false; diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml index b5501d8e3..d44c67bf0 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml @@ -71,7 +71,9 @@ Open containing folder Opens the location that contains the file or folder Open With Editor: + Failed to open file at {0} with Editor {1} at {2} Open With Shell: + Failed to open folder {0} with Shell {1} at {2} Exclude current and sub-directories from Index Search Excluded from Index Search Open Windows Indexing Options @@ -88,7 +90,7 @@ Remove from Quick Access Remove the current {0} from Quick Access Show Windows Context Menu - + Everything SDK Loaded Fail Warning: Everything service is not running From 14ae0129495641c2f06025cb9206b9ad23076af5 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Wed, 14 Dec 2022 01:18:57 +0800 Subject: [PATCH 3/4] Use ArgumentList --- Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs index 0c9b78ca8..4733e09e9 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs @@ -322,7 +322,11 @@ namespace Flow.Launcher.Plugin.Explorer { try { - Process.Start(editorPath, '"' + record.FullPath + '"'); + Process.Start(new ProcessStartInfo() + { + FileName = editorPath, + ArgumentList = { record.FullPath } + }); return true; } catch (Exception e) From 85783e725fdd1c41bdc19ed5c7db10950e6b8eb3 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Wed, 14 Dec 2022 08:27:18 +1100 Subject: [PATCH 4/4] bump Explorer plugin version --- Plugins/Flow.Launcher.Plugin.Explorer/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json index 30933b17f..7f06ec76f 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json @@ -10,7 +10,7 @@ "Name": "Explorer", "Description": "Search and manage files and folders. Explorer utilises Windows Index Search", "Author": "Jeremy Wu", - "Version": "2.0.0", + "Version": "2.0.1", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",