prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve code quality

Browse source
This commit is contained in:
Jack251970 2025-06-11 21:34:33 +08:00
parent b15cece4b8
commit 255ca5ac01
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Plugins/Flow.Launcher.Plugin.Shell/Main.cs
View file

@ -23,6 +23,18 @@ namespace Flow.Launcher.Plugin.Shell
private bool _winRStroked; private bool _winRStroked;
private readonly KeyboardSimulator _keyboardSimulator = new(new InputSimulator()); private readonly KeyboardSimulator _keyboardSimulator = new(new InputSimulator());
private static readonly string[] possibleCmdPaths = new[]
{
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "cmd.exe"),
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\cmd.exe")
};
private static readonly string[] possiblePowershellPaths = new[]
{
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), @"WindowsPowerShell\v1.0\powershell.exe"),
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\WindowsPowerShell\v1.0\powershell.exe")
};
private static readonly string[] possiblePwshPaths = new[] private static readonly string[] possiblePwshPaths = new[]
{ {
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"PowerShell\7\pwsh.exe"), Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"PowerShell\7\pwsh.exe"),
@ -30,6 +42,13 @@ namespace Flow.Launcher.Plugin.Shell
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), @"scoop\apps\pwsh\current\pwsh.exe") // if using Scoop Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), @"scoop\apps\pwsh\current\pwsh.exe") // if using Scoop
}; };
private static readonly string[] possibleWTPowerShellPaths = new[]
{
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
// if using Windows Terminal from Microsoft Store
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"WindowsApps\Microsoft.WindowsTerminal_*\wt.exe")
};
private Settings _settings; private Settings _settings;
public List<Result> Query(Query query) public List<Result> Query(Query query)
@ -318,12 +337,17 @@ namespace Flow.Launcher.Plugin.Shell
{ {
var absoluteFileName = info.FileName switch var absoluteFileName = info.FileName switch
{ {
"cmd.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "cmd.exe"), "cmd.exe" => possibleCmdPaths.FirstOrDefault(File.Exists),
"powershell.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), @"WindowsPowerShell\v1.0\powershell.exe"), "powershell.exe" => possiblePowershellPaths.FirstOrDefault(File.Exists),
"pwsh.exe" => possiblePwshPaths.FirstOrDefault(File.Exists), "pwsh.exe" => possiblePwshPaths.FirstOrDefault(File.Exists),
"wt.exe" => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"), "wt.exe" => possibleWTPowerShellPaths.FirstOrDefault(File.Exists),
_ => info.FileName, _ => info.FileName,
}; };
if (string.IsNullOrEmpty(absoluteFileName))
{
Context.API.LogError(ClassName, $"The command '{info.FileName}' could not be found in the system PATH or the specified directories.");
return null;
}
Context.API.StartProcess(absoluteFileName, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas"); Context.API.StartProcess(absoluteFileName, info.WorkingDirectory, string.Join(" ", info.ArgumentList), info.Verb == "runas");
return null; return null;
} }