Set environment var dict in LoadEnvironmentStringPaths()

This commit is contained in:
Vic 2023-01-20 15:27:19 +08:00
parent 966d3e752e
commit 71a2f996db

View file

@ -16,7 +16,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
{ {
if (_envStringPaths == null) if (_envStringPaths == null)
{ {
_envStringPaths = LoadEnvironmentStringPaths(); LoadEnvironmentStringPaths();
} }
return _envStringPaths; return _envStringPaths;
} }
@ -40,9 +40,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
dir.Split('%').Length == 3); dir.Split('%').Length == 3);
} }
internal static Dictionary<string, string> LoadEnvironmentStringPaths() private static void LoadEnvironmentStringPaths()
{ {
var envStringPaths = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase); _envStringPaths = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
var homedrive = Environment.GetEnvironmentVariable("HOMEDRIVE")?.EnsureTrailingSlash() ?? "C:\\"; var homedrive = Environment.GetEnvironmentVariable("HOMEDRIVE")?.EnsureTrailingSlash() ?? "C:\\";
foreach (DictionaryEntry special in Environment.GetEnvironmentVariables()) foreach (DictionaryEntry special in Environment.GetEnvironmentVariables())
@ -61,11 +61,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search
{ {
// Variables are returned with a mixture of all upper/lower case. // Variables are returned with a mixture of all upper/lower case.
// Call ToUpper() to make the results look consistent // Call ToUpper() to make the results look consistent
envStringPaths.Add(special.Key.ToString().ToUpper(), path); _envStringPaths.Add(special.Key.ToString().ToUpper(), path);
} }
} }
return envStringPaths;
} }
internal static List<Result> GetEnvironmentStringPathSuggestions(string querySearch, Query query, PluginInitContext context) internal static List<Result> GetEnvironmentStringPathSuggestions(string querySearch, Query query, PluginInitContext context)