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

Remove DLL support and require all packages/plugins to be zip archives

Browse source
This commit is contained in:
Claus Vium 2019-02-11 18:52:09 +01:00
parent 8fd9f5b6a4
commit da169dddb5
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -529,20 +529,17 @@ namespace Emby.Server.Implementations.Updates
private async Task PerformPackageInstallation(IProgress<double> progress, string target, PackageVersionInfo package, CancellationToken cancellationToken) private async Task PerformPackageInstallation(IProgress<double> progress, string target, PackageVersionInfo package, CancellationToken cancellationToken)
{ {
// Target based on if it is an archive or single assembly
var extension = Path.GetExtension(package.targetFilename); var extension = Path.GetExtension(package.targetFilename);
var isArchive = string.Equals(extension, ".zip", StringComparison.OrdinalIgnoreCase); var isArchive = string.Equals(extension, ".zip", StringComparison.OrdinalIgnoreCase);
if (!isArchive)
{
_logger.LogError("Only zip packages are supported. {Filename} is not a zip archive.", package.targetFilename);
return;
}
if (target == null) if (target == null)
{ {
if (isArchive) target = Path.Combine(_appPaths.PluginsPath, Path.GetFileNameWithoutExtension(package.targetFilename));
{
target = Path.Combine(_appPaths.PluginsPath, Path.GetFileNameWithoutExtension(package.targetFilename));
}
else
{
target = Path.Combine(_appPaths.PluginsPath, package.targetFilename);
}
} }
// Download to temporary file so that, if interrupted, it won't destroy the existing installation // Download to temporary file so that, if interrupted, it won't destroy the existing installation
@ -561,17 +558,9 @@ namespace Emby.Server.Implementations.Updates
// Success - move it to the real target // Success - move it to the real target
try try
{ {
if (isArchive) using (var stream = File.OpenRead(tempFile))
{ {
using (var stream = File.OpenRead(tempFile)) _zipClient.ExtractAllFromZip(stream, target, true);
{
_zipClient.ExtractAllFromZip(stream, target, true);
}
}
else
{
Directory.CreateDirectory(Path.GetDirectoryName(target));
File.Copy(tempFile, target, true);
} }
} }
catch (IOException ex) catch (IOException ex)