Register and construct ITaskManager and IIsoManager correctly

This commit is contained in:
Mark Monteiro
2020-04-04 21:00:11 -04:00
parent 3f2f95d877
commit adf0e8d3fd
2 changed files with 6 additions and 26 deletions

View File

@@ -255,16 +255,12 @@ namespace Emby.Server.Implementations
protected readonly IXmlSerializer XmlSerializer;
protected ITaskManager TaskManager { get; private set; }
public IHttpClient HttpClient { get; private set; }
protected INetworkManager NetworkManager { get; set; }
public IJsonSerializer JsonSerializer { get; private set; }
protected IIsoManager IsoManager { get; private set; }
/// <summary>
/// Initializes a new instance of the <see cref="ApplicationHost" /> class.
/// </summary>
@@ -593,11 +589,9 @@ namespace Emby.Server.Implementations
serviceCollection.AddSingleton(NetworkManager);
IsoManager = new IsoManager();
serviceCollection.AddSingleton(IsoManager);
serviceCollection.AddSingleton<IIsoManager, IsoManager>();
TaskManager = new TaskManager(ApplicationPaths, JsonSerializer, LoggerFactory, FileSystemManager);
serviceCollection.AddSingleton(TaskManager);
serviceCollection.AddSingleton<ITaskManager, TaskManager>();
serviceCollection.AddSingleton(XmlSerializer);
@@ -926,7 +920,7 @@ namespace Emby.Server.Implementations
Resolve<INotificationManager>().AddParts(GetExports<INotificationService>(), GetExports<INotificationTypeFactory>());
Resolve<IUserManager>().AddParts(GetExports<IAuthenticationProvider>(), GetExports<IPasswordResetProvider>());
IsoManager.AddParts(GetExports<IIsoMounter>());
Resolve<IIsoManager>().AddParts(GetExports<IIsoMounter>());
}
private IPlugin LoadPlugin(IPlugin plugin)