Modified to work with manifests.
This commit is contained in:
parent
60e8f47194
commit
81f655803d
|
@ -38,6 +38,7 @@ using Emby.Server.Implementations.LiveTv;
|
||||||
using Emby.Server.Implementations.Localization;
|
using Emby.Server.Implementations.Localization;
|
||||||
using Emby.Server.Implementations.Net;
|
using Emby.Server.Implementations.Net;
|
||||||
using Emby.Server.Implementations.Playlists;
|
using Emby.Server.Implementations.Playlists;
|
||||||
|
using Emby.Server.Implementations.Plugins;
|
||||||
using Emby.Server.Implementations.QuickConnect;
|
using Emby.Server.Implementations.QuickConnect;
|
||||||
using Emby.Server.Implementations.ScheduledTasks;
|
using Emby.Server.Implementations.ScheduledTasks;
|
||||||
using Emby.Server.Implementations.Security;
|
using Emby.Server.Implementations.Security;
|
||||||
|
@ -1020,7 +1021,7 @@ namespace Emby.Server.Implementations
|
||||||
/// Comparison function used in <see cref="GetLatestDLLVersion" />.
|
/// Comparison function used in <see cref="GetLatestDLLVersion" />.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static int VersionCompare(
|
private static int VersionCompare(
|
||||||
(Version PluginVersion, string Name, string Path) a,
|
(Version PluginVersion, string Name, string Path) a,
|
||||||
(Version PluginVersion, string Name, string Path) b)
|
(Version PluginVersion, string Name, string Path) b)
|
||||||
{
|
{
|
||||||
int compare = string.Compare(a.Name, b.Name, true, CultureInfo.InvariantCulture);
|
int compare = string.Compare(a.Name, b.Name, true, CultureInfo.InvariantCulture);
|
||||||
|
@ -1033,32 +1034,38 @@ namespace Emby.Server.Implementations
|
||||||
return compare;
|
return compare;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
private IEnumerable<string> GetPlugins(string path, bool cleanup = true)
|
||||||
/// Only loads the latest version of each assembly based upon the folder name.
|
|
||||||
/// eg. MyAssembly_11.9.3.6 - will be ignored.
|
|
||||||
/// MyAssembly_12.2.3.6 - will be loaded.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="path">Path to enumerate.</param>
|
|
||||||
/// <param name="cleanup">Set to true, to try and clean up earlier versions.</param>
|
|
||||||
/// <returns>IEnumerable{string} of filenames.</returns>
|
|
||||||
protected IEnumerable<string> GetLatestDLLVersion(string path, bool cleanup = true)
|
|
||||||
{
|
{
|
||||||
var dllList = new List<string>();
|
var dllList = new List<string>();
|
||||||
var versions = new List<(Version PluginVersion, string Name, string Path)>();
|
var versions = new List<(Version PluginVersion, string Name, string Path)>();
|
||||||
var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
|
var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly);
|
||||||
|
|
||||||
|
var serializer = new JsonSerializer();
|
||||||
foreach (var dir in directories)
|
foreach (var dir in directories)
|
||||||
{
|
{
|
||||||
int underscoreIndex = dir.LastIndexOf('_');
|
try
|
||||||
if (underscoreIndex != -1 && Version.TryParse(dir.Substring(underscoreIndex + 1), out Version ver))
|
|
||||||
{
|
{
|
||||||
// Versioned folder.
|
var manifest = serializer.DeserializeFromFile<PlugInManifest>(dir + "\\meta.json");
|
||||||
versions.Add((ver, dir.Substring(0, underscoreIndex), dir));
|
|
||||||
|
if (!Version.TryParse(manifest.TargetAbi, out var targetAbi))
|
||||||
|
{
|
||||||
|
targetAbi = new Version("0.0.0.1");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Version.TryParse(manifest.Version, out var version))
|
||||||
|
{
|
||||||
|
version = new Version("0.0.0.1");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (targetAbi <= ApplicationVersion)
|
||||||
|
{
|
||||||
|
// Only load Plugins for this version or below.
|
||||||
|
versions.Add((version, manifest.Name, dir));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
catch
|
||||||
{
|
{
|
||||||
// Un-versioned folder.
|
continue;
|
||||||
versions.Add((new Version(), dir, dir));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1101,7 +1108,7 @@ namespace Emby.Server.Implementations
|
||||||
{
|
{
|
||||||
if (Directory.Exists(ApplicationPaths.PluginsPath))
|
if (Directory.Exists(ApplicationPaths.PluginsPath))
|
||||||
{
|
{
|
||||||
foreach (var file in GetLatestDLLVersion(ApplicationPaths.PluginsPath))
|
foreach (var file in GetPlugins(ApplicationPaths.PluginsPath))
|
||||||
{
|
{
|
||||||
Assembly plugAss;
|
Assembly plugAss;
|
||||||
try
|
try
|
||||||
|
|
32
Emby.Server.Implementations/Plugins/PlugInManifest.cs
Normal file
32
Emby.Server.Implementations/Plugins/PlugInManifest.cs
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Emby.Server.Implementations.Plugins
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Defines a Plugin manifest file.
|
||||||
|
/// </summary>
|
||||||
|
public class PlugInManifest
|
||||||
|
{
|
||||||
|
public string Category { get; set; }
|
||||||
|
|
||||||
|
public string Changelog { get; set; }
|
||||||
|
|
||||||
|
public string Description { get; set; }
|
||||||
|
|
||||||
|
public Guid Guid { get; set; }
|
||||||
|
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public string Overview { get; set; }
|
||||||
|
|
||||||
|
public string Owner { get; set; }
|
||||||
|
|
||||||
|
public string TargetAbi { get; set; }
|
||||||
|
|
||||||
|
public DateTime Timestamp { get; set; }
|
||||||
|
|
||||||
|
public string Version { get; set; }
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user