Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-06 05:43:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add versioning to plugin folders

Browse source
This commit is contained in:
BaronGreenback 2020-06-21 13:29:35 +01:00
parent b5586e64f5
commit a041fe8a2d
2 changed files with 123 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
Emby.Server.Implementations/ApplicationHost.cs
View file

@ -1008,6 +1008,102 @@ namespace Emby.Server.Implementations
protected abstract void RestartInternal();
/// <summary>
/// Converts an string array to a number.
/// Element 0 is the filename.
/// </summary>
/// <param name="version">Parts of the filename.</param>
/// <returns>Long representing the version of the file.</returns>
private long StrToVersion(string[] version)
{
if (version.Length > 4)
{
Logger.LogError("Plugin version number too complex : {0}.", version[0]);
return -1;
}
// Build version into a string. 1.2.3.4 => 001002003004 (max 999999999999
string res = string.Empty;
for (int x = 1; x <= version.Length; x++)
{
res += version[1].PadLeft(3 - version[1].Length, '0');
}
return long.Parse(res, CultureInfo.InvariantCulture);
}
/// <summary>
/// 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 = false)
{
var dllList = new List<string>();
var versions = new SortedList<long, string>();
var directories = Directory.EnumerateDirectories(path, "*.*", SearchOption.TopDirectoryOnly).ToList();
var folder = string.Empty;
// Only add the latest version of the folder into the list.
foreach (var dir in directories)
{
string[] parts = dir.Split(".");
if (parts.Length == 1)
{
dllList.AddRange(Directory.EnumerateFiles(dir, "*.dll", SearchOption.AllDirectories).ToList());
}
else
{
// Add for version comparison later.
versions.Add(StrToVersion(parts), parts[0]);
}
}
if (versions.Count > 0)
{
string lastName = string.Empty;
// Traverse backwards through the list.
// The first item will be the latest version.
for (int x = versions.Count - 1; x > 0; x--)
{
folder = versions.Values[x];
if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
{
dllList.AddRange(Directory.EnumerateFiles(path + "\\" + folder, "*.dll", SearchOption.AllDirectories));
lastName = folder;
continue;
}
if (!string.IsNullOrEmpty(lastName) && cleanup)
{
// Attempt a cleanup of old folders.
try
{
Logger.LogDebug("Attempting to delete {0}", path + "\\" + folder);
Directory.Delete(path + "\\" + folder);
}
catch
{
// Ignore errors.
}
}
}
folder = versions.Values[0];
if (!string.Equals(lastName, folder, StringComparison.OrdinalIgnoreCase))
{
dllList.AddRange(Directory.EnumerateFiles(path + "\\" + folder, "*.dll", SearchOption.AllDirectories));
}
}
return dllList;
}
/// <summary>
/// Gets the composable part assemblies.
/// </summary>
@ -1016,7 +1112,7 @@ namespace Emby.Server.Implementations
{
if (Directory.Exists(ApplicationPaths.PluginsPath))
{
foreach (var file in Directory.EnumerateFiles(ApplicationPaths.PluginsPath, "*.dll", SearchOption.AllDirectories))
foreach (var file in GetLatestDLLVersion(ApplicationPaths.PluginsPath))
{
Assembly plugAss;
try

33
Emby.Server.Implementations/Updates/InstallationManager.cs
View file

@ -16,6 +16,7 @@ using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Plugins;
using MediaBrowser.Common.Updates;
using MediaBrowser.Common.System;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Events;
using MediaBrowser.Model.IO;
@ -23,6 +24,7 @@ using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Updates;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.System;
namespace Emby.Server.Implementations.Updates
{
@ -384,9 +386,19 @@ namespace Emby.Server.Implementations.Updates
throw new InvalidDataException("The checksum of the received data doesn't match.");
}
// Version folder as they cannot be overwritten in Windows.
targetDir += package.Version.ToString();
if (Directory.Exists(targetDir))
{
Directory.Delete(targetDir, true);
try
{
Directory.Delete(targetDir, true);
}
catch
{
// Ignore any exceptions.
}
}
stream.Position = 0;
@ -425,15 +437,22 @@ namespace Emby.Server.Implementations.Updates
path = file;
}
if (isDirectory)
try
{
_logger.LogInformation("Deleting plugin directory {0}", path);
Directory.Delete(path, true);
if (isDirectory)
{
_logger.LogInformation("Deleting plugin directory {0}", path);
Directory.Delete(path, true);
}
else
{
_logger.LogInformation("Deleting plugin file {0}", path);
_fileSystem.DeleteFile(path);
}
}
else
catch
{
_logger.LogInformation("Deleting plugin file {0}", path);
_fileSystem.DeleteFile(path);
// Ignore file errors.
}
var list = _config.Configuration.UninstalledPlugins.ToList();