michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
BaronGreenback 2021-01-19 21:15:40 +00:00
parent 7acee4070e
commit 89046e1d97
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Emby.Server.Implementations/Plugins/PluginManager.cs
View File

@ -374,7 +374,7 @@ namespace Emby.Server.Implementations.Plugins
private LocalPlugin? GetPluginByAssembly(Assembly assembly) private LocalPlugin? GetPluginByAssembly(Assembly assembly)
{ {
// Find which plugin it is by the path. // Find which plugin it is by the path.
return _plugins.FirstOrDefault(p => string.Equals(p.Path, Path.GetDirectoryName(assembly.Location), StringComparison.Ordinal)); return _plugins.FirstOrDefault(p => p.DllFiles.Contains(assembly.Location, StringComparer.Ordinal));
} }
/// <summary> /// <summary>
@ -421,15 +421,17 @@ namespace Emby.Server.Implementations.Plugins
{ {
plugin.Instance = instance; plugin.Instance = instance;
var manifest = plugin.Manifest; var manifest = plugin.Manifest;
var pluginStr = plugin.Instance.Version.ToString(); var pluginStr = instance.Version.ToString();
bool changed = false; bool changed = false;
if (string.Equals(manifest.Version, pluginStr, StringComparison.Ordinal)) if (string.Equals(manifest.Version, pluginStr, StringComparison.Ordinal)
|| manifest.Id != instance.Id)
{ {
// If a plugin without a manifest failed to load due to an external issue (eg config), // If a plugin without a manifest failed to load due to an external issue (eg config),
// this updates the manifest to the actual plugin values. // this updates the manifest to the actual plugin values.
manifest.Version = pluginStr; manifest.Version = pluginStr;
manifest.Name = plugin.Instance.Name; manifest.Name = plugin.Instance.Name;
manifest.Description = plugin.Instance.Description; manifest.Description = plugin.Instance.Description;
manifest.Id = plugin.Instance.Id;
changed = true; changed = true;
} }
@ -559,7 +561,7 @@ namespace Emby.Server.Implementations.Plugins
// Auto-create a plugin manifest, so we can disable it, if it fails to load. // Auto-create a plugin manifest, so we can disable it, if it fails to load.
manifest = new PluginManifest manifest = new PluginManifest
{ {
Status = PluginStatus.Restart, Status = PluginStatus.Active,
Name = metafile, Name = metafile,
AutoUpdate = false, AutoUpdate = false,
Id = metafile.GetMD5(), Id = metafile.GetMD5(),