From eac5c4c47c51d68f31a0ea4c6aa526c715569ead Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Sun, 16 Aug 2020 21:49:22 +1000 Subject: [PATCH] update per comment --- Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs | 3 +-- Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs index 98fa9aa64..e93c341dc 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs @@ -30,7 +30,6 @@ namespace Flow.Launcher.Infrastructure.UserSettings } public static readonly string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins); - public static readonly string SettingsDirectory = Path.Combine(DataDirectory(), "Settings"); - public static readonly string PluginSettingsDirectory = Path.Combine(SettingsDirectory, Constant.Plugins); + public static readonly string PluginSettingsDirectory = Path.Combine(DataDirectory(), "Settings", Constant.Plugins); } } diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs index b9d7b4f71..b5d988f4f 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs @@ -174,11 +174,14 @@ namespace Flow.Launcher.Plugin.WebSearch _context = context; var pluginDirectory = _context.CurrentPluginMetadata.PluginDirectory; var bundledImagesDirectory = Path.Combine(pluginDirectory, Images); + + // Default images directory is in the WebSearch's application folder DefaultImagesDirectory = Path.Combine(_context.CurrentPluginMetadata.PluginDirectory, Images); Helper.ValidateDataDirectory(bundledImagesDirectory, DefaultImagesDirectory); + // Custom images directory is in the WebSearch's data location folder var name = Path.GetFileNameWithoutExtension(_context.CurrentPluginMetadata.ExecuteFileName); - CustomImagesDirectory = Path.Combine(DataLocation.PluginSettingsDirectory, $"{name}\\CustomIcons"); + CustomImagesDirectory = Path.Combine(DataLocation.PluginSettingsDirectory, name, "CustomIcons"); } #region ISettingProvider Members