Don't call init() and constructor for disabled plugins

part of #351
This commit is contained in:
bao-qian
2016-05-10 01:08:54 +01:00
parent 06010b1366
commit 405d55f3f6
4 changed files with 41 additions and 21 deletions

View File

@@ -55,18 +55,22 @@ namespace Wox.Core.Plugin
{
ValidateUserDirectory();
// todo happlebao temp hack to let MainVM to register ResultsUpdated event
_metadatas = PluginConfig.Parse(Directories);
AllPlugins = PluginsLoader.CSharpPlugins(_metadatas).ToList();
}
public static void InitializePlugins(IPublicAPI api, PluginsSettings settings)
{
_settings = settings;
var plugins = PluginsLoader.PythonPlugins(_metadatas, _settings.PythonDirectory);
var executable_plugins = PluginsLoader.ExecutablePlugins(_metadatas);
AllPlugins = AllPlugins.Concat(plugins).Concat(executable_plugins).ToList();
_settings.UpdatePluginSettings(AllPlugins);
/// <summary>
/// because InitializePlugins needs API, so LoadPlugins needs to be called first
/// todo happlebao The API should be removed
/// </summary>
/// <param name="settings"></param>
public static void LoadPlugins(PluginsSettings settings)
{
_metadatas = PluginConfig.Parse(Directories);
_settings = settings;
AllPlugins = PluginsLoader.Plugins(_metadatas, _settings);
_settings.UpdatePluginSettings(AllPlugins);
}
public static void InitializePlugins(IPublicAPI api)
{
//load plugin i18n languages
ResourceMerger.UpdatePluginLanguages();
@@ -149,7 +153,7 @@ namespace Wox.Core.Plugin
}
}
//happlebao todo prevent plugin initial when plugin is disabled
//happlebao todo dynamic release corresponding dll / exe / process
public static void DisablePlugin(PluginPair plugin)
{
var actionKeywords = plugin.Metadata.ActionKeywords;

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using Wox.Core.UserSettings;
using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger;
using Wox.Plugin;
@@ -15,6 +16,16 @@ namespace Wox.Core.Plugin
public const string Python = "python";
public const string PythonExecutable = "pythonw.exe";
public static List<PluginPair> Plugins(List<PluginMetadata> source, PluginsSettings settings)
{
var metadatas = source.Where(m => !settings.Plugins[m.ID].Disabled).ToList();
var csharpPlugins = CSharpPlugins(metadatas).ToList();
var pythonPlugins = PythonPlugins(metadatas, settings.PythonDirectory);
var executablePlugins = ExecutablePlugins(metadatas);
var plugins = csharpPlugins.Concat(pythonPlugins).Concat(executablePlugins).ToList();
return plugins;
}
public static IEnumerable<PluginPair> CSharpPlugins(List<PluginMetadata> source)
{
var plugins = new List<PluginPair>();