starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for ZIP plugin archives

Browse Source 
Most code from @cvium. Also removes the lazy and ill-conceived GUID-
based checksumming, which just died with ZIP archives.
This commit is contained in:
Joshua Boniface
2019-02-10 17:29:55 -05:00
parent bcb32ec6ad
commit 2f4a00d322
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -564,7 +564,7 @@ namespace Emby.Server.Implementations
{
try
{
var assembly = Assembly.Load(File.ReadAllBytes(file));
var assembly = Assembly.LoadFrom(file);
return new Tuple<Assembly, string>(assembly, file);
}
@@ -777,12 +777,12 @@ namespace Emby.Server.Implementations
SocketFactory = new SocketFactory();
RegisterSingleInstance(SocketFactory);
InstallationManager = new InstallationManager(LoggerFactory, this, ApplicationPaths, HttpClient, JsonSerializer, ServerConfigurationManager, FileSystemManager, CryptographyProvider, PackageRuntime);
RegisterSingleInstance(InstallationManager);
ZipClient = new ZipClient(FileSystemManager);
RegisterSingleInstance(ZipClient);
InstallationManager = new InstallationManager(LoggerFactory, this, ApplicationPaths, HttpClient, JsonSerializer, ServerConfigurationManager, FileSystemManager, CryptographyProvider, ZipClient, PackageRuntime);
RegisterSingleInstance(InstallationManager);
HttpResultFactory = new HttpResultFactory(LoggerFactory, FileSystemManager, JsonSerializer, CreateBrotliCompressor());
RegisterSingleInstance(HttpResultFactory);
@@ -1603,7 +1603,7 @@ namespace Emby.Server.Implementations
{
try
{
return FilterAssembliesToLoad(Directory.EnumerateFiles(path, "*.dll", SearchOption.TopDirectoryOnly))
return FilterAssembliesToLoad(Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories))
.Select(LoadAssembly)
.Where(a => a != null)
.ToList();