From 2f5daf7bc4f9fff5cc3c1a8d8b758d9c7b6410b4 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 12 Nov 2019 20:28:46 +0100 Subject: [PATCH] Fixed built-in plugin version check --- src/Artemis.Core/Services/PluginService.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Artemis.Core/Services/PluginService.cs b/src/Artemis.Core/Services/PluginService.cs index ec4a6e3ee..84bb0dc20 100644 --- a/src/Artemis.Core/Services/PluginService.cs +++ b/src/Artemis.Core/Services/PluginService.cs @@ -70,18 +70,30 @@ namespace Artemis.Core.Services { var metadataFile = Path.Combine(match.FullName, "plugin.json"); if (!File.Exists(metadataFile)) + { + _logger.Information("Copying missing built-in plugin {name} version: {version}", + builtInPluginInfo.Name, builtInPluginInfo.Version); CopyBuiltInPlugin(subDirectory); + } else try { // Compare versions, copy if the same when debugging - var pluginInfo = JsonConvert.DeserializeObject(File.ReadAllText(builtInMetadataFile)); + var pluginInfo = JsonConvert.DeserializeObject(File.ReadAllText(metadataFile)); #if DEBUG if (builtInPluginInfo.Version >= pluginInfo.Version) + { + _logger.Information("Copying updated built-in plugin {name} version: {version} (old version: {oldVersion})", + builtInPluginInfo.Name, builtInPluginInfo.Version, pluginInfo.Version); CopyBuiltInPlugin(subDirectory); + } #else - if (builtInPluginInfo.Version > pluginInfo.Version) + if (builtInPluginInfo.Version > pluginInfo.Version) + { + _logger.Information("Copying updated built-in plugin {name} version: {version} (old version: {oldVersion})", + builtInPluginInfo.Name, builtInPluginInfo.Version, pluginInfo.Version); CopyBuiltInPlugin(subDirectory); + } #endif } catch (Exception e) @@ -144,6 +156,7 @@ namespace Artemis.Core.Services { _logger.Warning(new ArtemisPluginException(pluginInfo, "Failed to load enable plugin", e), "Plugin exception"); } + OnPluginEnabled(new PluginEventArgs(pluginInfo)); }