From c2764fda457f8a015189b2f8c9528a4664491081 Mon Sep 17 00:00:00 2001 From: bao-qian Date: Mon, 6 Feb 2017 22:15:28 +0000 Subject: [PATCH] use proper plugin metadata --- Plugins/Wox.Plugin.WebSearch/Main.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Plugins/Wox.Plugin.WebSearch/Main.cs b/Plugins/Wox.Plugin.WebSearch/Main.cs index a34f0a4555..316955ca0b 100644 --- a/Plugins/Wox.Plugin.WebSearch/Main.cs +++ b/Plugins/Wox.Plugin.WebSearch/Main.cs @@ -21,7 +21,7 @@ namespace Wox.Plugin.WebSearch private CancellationToken _updateToken; public const string Images = "Images"; - public static readonly string ImagesDirectory; + public static string ImagesDirectory; public void Save() { @@ -124,14 +124,6 @@ namespace Wox.Plugin.WebSearch return new List(); } - static Main() - { - var plugins = Constant.Plugins; - var assemblyName = typeof (Main).Assembly.GetName().Name; - var pluginDirectory = Path.Combine(Constant.SettingsPath, plugins, assemblyName); - ImagesDirectory = Path.Combine(pluginDirectory, Images); - } - public Main() { _viewModel = new SettingsViewModel(); @@ -140,10 +132,10 @@ namespace Wox.Plugin.WebSearch public void Init(PluginInitContext context) { - _context = context; var pluginDirectory = context.CurrentPluginMetadata.PluginDirectory; var bundledImagesDirectory = Path.Combine(pluginDirectory, Images); + ImagesDirectory = Path.Combine(_context.CurrentPluginMetadata.PluginDirectory, Images); Helper.ValidateDataDirectory(bundledImagesDirectory, ImagesDirectory); }