diff options
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 77b49fbf1..00db91f41 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -71,12 +71,6 @@ namespace MediaBrowser.ServerApplication public class ApplicationHost : BaseApplicationHost<ServerApplicationPaths>, IServerApplicationHost { /// <summary> - /// Gets the server kernel. - /// </summary> - /// <value>The server kernel.</value> - protected Kernel ServerKernel { get; set; } - - /// <summary> /// Gets the server configuration manager. /// </summary> /// <value>The server configuration manager.</value> @@ -168,7 +162,7 @@ namespace MediaBrowser.ServerApplication private IUserDataManager UserDataManager { get; set; } private IUserRepository UserRepository { get; set; } internal IDisplayPreferencesRepository DisplayPreferencesRepository { get; set; } - private IItemRepository ItemRepository { get; set; } + internal IItemRepository ItemRepository { get; set; } private INotificationsRepository NotificationsRepository { get; set; } /// <summary> @@ -220,8 +214,6 @@ namespace MediaBrowser.ServerApplication /// <returns>Task.</returns> protected override async Task RegisterResources(IProgress<double> progress) { - ServerKernel = new Kernel(); - await base.RegisterResources(progress).ConfigureAwait(false); RegisterSingleInstance<IHttpResultFactory>(new HttpResultFactory(LogManager, FileSystemManager)); @@ -229,7 +221,6 @@ namespace MediaBrowser.ServerApplication RegisterSingleInstance<IServerApplicationHost>(this); RegisterSingleInstance<IServerApplicationPaths>(ApplicationPaths); - RegisterSingleInstance(ServerKernel); RegisterSingleInstance(ServerConfigurationManager); RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger)); @@ -301,6 +292,8 @@ namespace MediaBrowser.ServerApplication await Task.WhenAll(itemsTask, displayPreferencesTask, userdataTask).ConfigureAwait(false); progress.Report(100); + await ((UserManager) UserManager).Initialize().ConfigureAwait(false); + SetKernelProperties(); } @@ -331,11 +324,11 @@ namespace MediaBrowser.ServerApplication /// </summary> private void SetKernelProperties() { - Parallel.Invoke( - () => ServerKernel.FFMpegManager = new FFMpegManager(ApplicationPaths, MediaEncoder, Logger, ItemRepository, FileSystemManager), - () => LocalizedStrings.StringFiles = GetExports<LocalizedStringData>(), - SetStaticProperties - ); + new FFMpegManager(MediaEncoder, Logger, ItemRepository, FileSystemManager, ServerConfigurationManager); + + LocalizedStrings.StringFiles = GetExports<LocalizedStringData>(); + + SetStaticProperties(); } /// <summary> @@ -451,6 +444,8 @@ namespace MediaBrowser.ServerApplication ImageProcessor.AddParts(GetExports<IImageEnhancer>()); LiveTvManager.AddParts(GetExports<ILiveTvService>()); + + SessionManager.AddParts(GetExports<ISessionControllerFactory>()); } /// <summary> @@ -568,7 +563,7 @@ namespace MediaBrowser.ServerApplication list.Add(typeof(IApplicationHost).Assembly); // Include composable parts in the Controller assembly - list.Add(typeof(Kernel).Assembly); + list.Add(typeof(IServerApplicationHost).Assembly); // Include composable parts in the Providers assembly list.Add(typeof(ImagesByNameProvider).Assembly); |