From 9911df11e8a96d5d7fffcd8618b63a6adb27701f Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Fri, 8 Mar 2013 00:08:27 -0500 Subject: extracted provider manager. took more off the kernel --- MediaBrowser.Controller/Entities/BaseItem.cs | 9 +++++---- MediaBrowser.Controller/Entities/User.cs | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Controller/Entities') diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index e80c3d71f..f90044d8b 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -96,9 +96,10 @@ namespace MediaBrowser.Controller.Entities /// /// The logger /// - protected static internal ILogger Logger { get; internal set; } - protected static internal ILibraryManager LibraryManager { get; internal set; } - protected static internal IServerConfigurationManager ConfigurationManager { get; internal set; } + public static ILogger Logger { get; set; } + public static ILibraryManager LibraryManager { get; set; } + public static IServerConfigurationManager ConfigurationManager { get; set; } + public static IProviderManager ProviderManager { get; set; } /// /// Returns a that represents this instance. @@ -652,7 +653,7 @@ namespace MediaBrowser.Controller.Entities LocalTrailers = null; // Refresh for the item - var itemRefreshTask = Kernel.Instance.ProviderManager.ExecuteMetadataProviders(this, cancellationToken, forceRefresh, allowSlowProviders); + var itemRefreshTask = ProviderManager.ExecuteMetadataProviders(this, cancellationToken, forceRefresh, allowSlowProviders); cancellationToken.ThrowIfCancellationRequested(); diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs index ef50a0867..7e50b1ea5 100644 --- a/MediaBrowser.Controller/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -18,8 +18,8 @@ namespace MediaBrowser.Controller.Entities /// public class User : BaseItem { - internal static IUserManager UserManager { get; set; } - internal static IXmlSerializer XmlSerializer { get; set; } + public static IUserManager UserManager { get; set; } + public static IXmlSerializer XmlSerializer { get; set; } /// /// The _root folder path @@ -363,7 +363,7 @@ namespace MediaBrowser.Controller.Entities ResolveArgs = null; } - var changed = await Kernel.Instance.ProviderManager.ExecuteMetadataProviders(this, cancellationToken, forceRefresh, allowSlowProviders).ConfigureAwait(false); + var changed = await ProviderManager.ExecuteMetadataProviders(this, cancellationToken, forceRefresh, allowSlowProviders).ConfigureAwait(false); if (changed || forceSave) { -- cgit v1.2.3