mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
Merge pull request #5064 from BaronGreenback/PluginFix
Plugin bug fixes
This commit is contained in:
commit
3fda50de6d
@ -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(),
|
||||||
|
Loading…
Reference in New Issue
Block a user