From a2d215b6ae9d594d71a679a464c9c6a559efe862 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Fri, 22 Feb 2013 19:24:50 -0500 Subject: added simple injector for dependancy management --- MediaBrowser.Controller/Kernel.cs | 46 +++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 11 deletions(-) (limited to 'MediaBrowser.Controller/Kernel.cs') diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 952160b2b..ea868ec45 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -1,5 +1,6 @@ using MediaBrowser.Common.IO; using MediaBrowser.Common.Kernel; +using MediaBrowser.Common.Localization; using MediaBrowser.Common.Plugins; using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; @@ -27,6 +28,7 @@ using System.ComponentModel.Composition.Hosting; using System.Linq; using System.Threading; using System.Threading.Tasks; +using SimpleInjector; namespace MediaBrowser.Controller { @@ -178,25 +180,29 @@ namespace MediaBrowser.Controller get { return KernelContext.Server; } } + /// + /// Gets the list of Localized string files + /// + /// The string files. + [ImportMany(typeof(LocalizedStringData))] + public IEnumerable StringFiles { get; private set; } + /// /// Gets the list of plugin configuration pages /// /// The configuration pages. - [ImportMany(typeof(IPluginConfigurationPage))] public IEnumerable PluginConfigurationPages { get; private set; } /// /// Gets the intro providers. /// /// The intro providers. - [ImportMany(typeof(IIntroProvider))] public IEnumerable IntroProviders { get; private set; } /// /// Gets the list of currently registered weather prvoiders /// /// The weather providers. - [ImportMany(typeof(IWeatherProvider))] public IEnumerable WeatherProviders { get; private set; } /// @@ -232,7 +238,6 @@ namespace MediaBrowser.Controller /// Gets the list of available user repositories /// /// The user repositories. - [ImportMany(typeof(IUserRepository))] private IEnumerable UserRepositories { get; set; } /// @@ -251,7 +256,6 @@ namespace MediaBrowser.Controller /// Gets the list of available item repositories /// /// The item repositories. - [ImportMany(typeof(IItemRepository))] private IEnumerable ItemRepositories { get; set; } /// @@ -264,22 +268,19 @@ namespace MediaBrowser.Controller /// Gets the list of available item repositories /// /// The user data repositories. - [ImportMany(typeof(IUserDataRepository))] private IEnumerable UserDataRepositories { get; set; } /// /// Gets the list of available DisplayPreferencesRepositories /// /// The display preferences repositories. - [ImportMany(typeof(IDisplayPreferencesRepository))] private IEnumerable DisplayPreferencesRepositories { get; set; } /// /// Gets the list of entity resolution ignore rules /// /// The entity resolution ignore rules. - [ImportMany(typeof(BaseResolutionIgnoreRule))] - internal IEnumerable EntityResolutionIgnoreRules { get; private set; } + internal IEnumerable EntityResolutionIgnoreRules { get; private set; } /// /// Gets the active user data repository @@ -357,12 +358,35 @@ namespace MediaBrowser.Controller /// Composes the exported values. /// /// The container. - protected override void ComposeExportedValues(CompositionContainer container) + /// The _ioc container. + protected override void ComposeExportedValues(CompositionContainer container, Container iocContainer) { - base.ComposeExportedValues(container); + base.ComposeExportedValues(container, iocContainer); container.ComposeExportedValue("kernel", this); container.ComposeExportedValue("blurayExaminer", BlurayExaminer); + + iocContainer.RegisterSingle(this); + iocContainer.RegisterSingle(BlurayExaminer); + } + + /// + /// Composes the parts with ioc container. + /// + /// All types. + /// The container. + protected override void ComposePartsWithIocContainer(Type[] allTypes, Container container) + { + base.ComposePartsWithIocContainer(allTypes, container); + + EntityResolutionIgnoreRules = GetExports(allTypes); + UserDataRepositories = GetExports(allTypes); + UserRepositories = GetExports(allTypes); + DisplayPreferencesRepositories = GetExports(allTypes); + ItemRepositories = GetExports(allTypes); + WeatherProviders = GetExports(allTypes); + IntroProviders = GetExports(allTypes); + PluginConfigurationPages = GetExports(allTypes); } /// -- cgit v1.2.3 From 6a5bf9cc780c6cd878be4c5111d64226208f0597 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Fri, 22 Feb 2013 19:44:20 -0500 Subject: extracted more interfaces --- MediaBrowser.Common/Kernel/BaseKernel.cs | 21 ++++- MediaBrowser.Common/Kernel/IWebSocketListener.cs | 3 +- MediaBrowser.Controller/Drawing/ImageManager.cs | 4 +- MediaBrowser.Controller/Kernel.cs | 4 +- .../MediaBrowser.Controller.csproj | 2 +- .../Providers/BaseImageEnhancer.cs | 99 ---------------------- .../Providers/IImageEnhancer.cs | 55 ++++++++++++ 7 files changed, 80 insertions(+), 108 deletions(-) delete mode 100644 MediaBrowser.Controller/Providers/BaseImageEnhancer.cs create mode 100644 MediaBrowser.Controller/Providers/IImageEnhancer.cs (limited to 'MediaBrowser.Controller/Kernel.cs') diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 91965e469..202bd3cab 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -197,7 +197,6 @@ namespace MediaBrowser.Common.Kernel /// Gets the web socket listeners. /// /// The web socket listeners. - [ImportMany(typeof(IWebSocketListener))] public IEnumerable WebSocketListeners { get; private set; } /// @@ -236,6 +235,11 @@ namespace MediaBrowser.Common.Kernel /// The rest services. public IEnumerable RestServices { get; private set; } + /// + /// The disposable parts + /// + private readonly List _disposableParts = new List(); + /// /// The _protobuf serializer initialized /// @@ -497,6 +501,7 @@ namespace MediaBrowser.Common.Kernel protected virtual void ComposePartsWithIocContainer(Type[] allTypes, Container container) { RestServices = GetExports(allTypes); + WebSocketListeners = GetExports(allTypes); } /// @@ -511,7 +516,11 @@ namespace MediaBrowser.Common.Kernel Logger.Info("Composing instances of " + currentType.Name); - return allTypes.Where(currentType.IsAssignableFrom).Select(Instantiate).Cast().ToArray(); + var parts = allTypes.Where(currentType.IsAssignableFrom).Select(Instantiate).Cast().ToArray(); + + _disposableParts.AddRange(parts.OfType()); + + return parts; } /// @@ -528,6 +537,7 @@ namespace MediaBrowser.Common.Kernel /// Composes the exported values. /// /// The container. + /// protected virtual void ComposeExportedValues(CompositionContainer container, Container iocContainer) { container.ComposeExportedValue("logger", Logger); @@ -733,6 +743,13 @@ namespace MediaBrowser.Common.Kernel DisposeHttpManager(); DisposeComposableParts(); + + foreach (var part in _disposableParts) + { + part.Dispose(); + } + + _disposableParts.Clear(); } } diff --git a/MediaBrowser.Common/Kernel/IWebSocketListener.cs b/MediaBrowser.Common/Kernel/IWebSocketListener.cs index 00be28ed3..b04bb6885 100644 --- a/MediaBrowser.Common/Kernel/IWebSocketListener.cs +++ b/MediaBrowser.Common/Kernel/IWebSocketListener.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Net; -using System; using System.Threading.Tasks; namespace MediaBrowser.Common.Kernel @@ -7,7 +6,7 @@ namespace MediaBrowser.Common.Kernel /// ///This is an interface for listening to messages coming through a web socket connection /// - public interface IWebSocketListener : IDisposable + public interface IWebSocketListener { /// /// Processes the message. diff --git a/MediaBrowser.Controller/Drawing/ImageManager.cs b/MediaBrowser.Controller/Drawing/ImageManager.cs index 16fd4a5b8..a0ba9d550 100644 --- a/MediaBrowser.Controller/Drawing/ImageManager.cs +++ b/MediaBrowser.Controller/Drawing/ImageManager.cs @@ -541,7 +541,7 @@ namespace MediaBrowser.Controller.Drawing /// Type of the image. /// Guid. /// item - public Guid GetImageCacheTag(string originalImagePath, DateTime dateModified, IEnumerable imageEnhancers, BaseItem item, ImageType imageType) + public Guid GetImageCacheTag(string originalImagePath, DateTime dateModified, IEnumerable imageEnhancers, BaseItem item, ImageType imageType) { if (item == null) { @@ -574,7 +574,7 @@ namespace MediaBrowser.Controller.Drawing /// Type of the image. /// Index of the image. /// Task{EnhancedImage}. - private async Task ExecuteImageEnhancers(IEnumerable imageEnhancers, Image originalImage, BaseItem item, ImageType imageType, int imageIndex) + private async Task ExecuteImageEnhancers(IEnumerable imageEnhancers, Image originalImage, BaseItem item, ImageType imageType, int imageIndex) { var result = originalImage; diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index ea868ec45..25a049435 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -217,8 +217,7 @@ namespace MediaBrowser.Controller /// Image processors are specialized metadata providers that run after the normal ones /// /// The image enhancers. - [ImportMany(typeof(BaseImageEnhancer))] - public BaseImageEnhancer[] ImageEnhancers { get; private set; } + public IEnumerable ImageEnhancers { get; private set; } /// /// Gets the list of currently registered entity resolvers @@ -387,6 +386,7 @@ namespace MediaBrowser.Controller WeatherProviders = GetExports(allTypes); IntroProviders = GetExports(allTypes); PluginConfigurationPages = GetExports(allTypes); + ImageEnhancers = GetExports(allTypes); } /// diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index b1a1dc567..26107b9c9 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -138,7 +138,7 @@ - + diff --git a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs b/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs deleted file mode 100644 index aeceeaf5f..000000000 --- a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs +++ /dev/null @@ -1,99 +0,0 @@ -using MediaBrowser.Controller.Entities; -using MediaBrowser.Model.Drawing; -using MediaBrowser.Model.Entities; -using System; -using System.Drawing; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Providers -{ - /// - /// Class BaseImageEnhancer - /// - public abstract class BaseImageEnhancer : IDisposable - { - /// - /// Return true only if the given image for the given item will be enhanced by this enhancer. - /// - /// The item. - /// Type of the image. - /// true if this enhancer will enhance the supplied image for the supplied item, false otherwise - public abstract bool Supports(BaseItem item, ImageType imageType); - - /// - /// Gets the priority or order in which this enhancer should be run. - /// - /// The priority. - public abstract MetadataProviderPriority Priority { get; } - - /// - /// Return the date of the last configuration change affecting the provided baseitem and image type - /// - /// The item. - /// Type of the image. - /// Date of last config change - public virtual DateTime LastConfigurationChange(BaseItem item, ImageType imageType) - { - return DateTime.MinValue; - } - - /// - /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. - /// - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - /// - /// Releases unmanaged and - optionally - managed resources. - /// - /// true to release both managed and unmanaged resources; false to release only unmanaged resources. - protected virtual void Dispose(bool dispose) - { - } - - /// - /// Gets the size of the enhanced image. - /// - /// The item. - /// Type of the image. - /// Index of the image. - /// Size of the original image. - /// ImageSize. - public virtual ImageSize GetEnhancedImageSize(BaseItem item, ImageType imageType, int imageIndex, ImageSize originalImageSize) - { - return originalImageSize; - } - - /// - /// Enhances the supplied image and returns it - /// - /// The item. - /// The original image. - /// Type of the image. - /// Index of the image. - /// Task{System.Drawing.Image}. - protected abstract Task EnhanceImageAsyncInternal(BaseItem item, Image originalImage, ImageType imageType, int imageIndex); - - /// - /// Enhances the image async. - /// - /// The item. - /// The original image. - /// Type of the image. - /// Index of the image. - /// Task{Image}. - /// - public Task EnhanceImageAsync(BaseItem item, Image originalImage, ImageType imageType, int imageIndex) - { - if (item == null || originalImage == null) - { - throw new ArgumentNullException(); - } - - return EnhanceImageAsyncInternal(item, originalImage, imageType, imageIndex); - } - } -} diff --git a/MediaBrowser.Controller/Providers/IImageEnhancer.cs b/MediaBrowser.Controller/Providers/IImageEnhancer.cs new file mode 100644 index 000000000..24296b664 --- /dev/null +++ b/MediaBrowser.Controller/Providers/IImageEnhancer.cs @@ -0,0 +1,55 @@ +using MediaBrowser.Controller.Entities; +using MediaBrowser.Model.Drawing; +using MediaBrowser.Model.Entities; +using System; +using System.Drawing; +using System.Threading.Tasks; + +namespace MediaBrowser.Controller.Providers +{ + public interface IImageEnhancer + { + /// + /// Return true only if the given image for the given item will be enhanced by this enhancer. + /// + /// The item. + /// Type of the image. + /// true if this enhancer will enhance the supplied image for the supplied item, false otherwise + bool Supports(BaseItem item, ImageType imageType); + + /// + /// Gets the priority or order in which this enhancer should be run. + /// + /// The priority. + MetadataProviderPriority Priority { get; } + + /// + /// Return the date of the last configuration change affecting the provided baseitem and image type + /// + /// The item. + /// Type of the image. + /// Date of last config change + DateTime LastConfigurationChange(BaseItem item, ImageType imageType); + + /// + /// Gets the size of the enhanced image. + /// + /// The item. + /// Type of the image. + /// Index of the image. + /// Size of the original image. + /// ImageSize. + ImageSize GetEnhancedImageSize(BaseItem item, ImageType imageType, int imageIndex, ImageSize originalImageSize); + + /// + /// Enhances the image async. + /// + /// The item. + /// The original image. + /// Type of the image. + /// Index of the image. + /// Task{Image}. + /// + Task EnhanceImageAsync(BaseItem item, Image originalImage, ImageType imageType, int imageIndex); + } +} \ No newline at end of file -- cgit v1.2.3 From 57cb08085d61682719c6c2804c37aa6aae6fd470 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Fri, 22 Feb 2013 20:24:04 -0500 Subject: fix broken images --- MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs | 15 +++++++++++++++ MediaBrowser.Controller/Kernel.cs | 4 ++-- MediaBrowser.Controller/Library/LibraryManager.cs | 4 ++-- MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 + .../MediaBrowser.WebDashboard.csproj | 6 +++--- 5 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs (limited to 'MediaBrowser.Controller/Kernel.cs') diff --git a/MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs b/MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs new file mode 100644 index 000000000..57e9e8d5d --- /dev/null +++ b/MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs @@ -0,0 +1,15 @@ + +namespace MediaBrowser.Controller.Entities +{ + /// + /// Interface IVirtualFolderCreator + /// + public interface IVirtualFolderCreator + { + /// + /// Gets the folder. + /// + /// Folder. + BasePluginFolder GetFolder(); + } +} diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 25a049435..6bd48a502 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -230,8 +230,7 @@ namespace MediaBrowser.Controller /// Gets the list of BasePluginFolders added by plugins /// /// The plugin folders. - [ImportMany(typeof(BasePluginFolder))] - internal IEnumerable PluginFolders { get; private set; } + internal IEnumerable PluginFolderCreators { get; private set; } /// /// Gets the list of available user repositories @@ -387,6 +386,7 @@ namespace MediaBrowser.Controller IntroProviders = GetExports(allTypes); PluginConfigurationPages = GetExports(allTypes); ImageEnhancers = GetExports(allTypes); + PluginFolderCreators = GetExports(allTypes); } /// diff --git a/MediaBrowser.Controller/Library/LibraryManager.cs b/MediaBrowser.Controller/Library/LibraryManager.cs index 4087f9ef8..dfaef12cb 100644 --- a/MediaBrowser.Controller/Library/LibraryManager.cs +++ b/MediaBrowser.Controller/Library/LibraryManager.cs @@ -186,9 +186,9 @@ namespace MediaBrowser.Controller.Library var rootFolder = Kernel.ItemRepository.RetrieveItem(rootFolderPath.GetMBId(typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)GetItem(rootFolderPath); // Add in the plug-in folders - foreach (var child in Kernel.PluginFolders) + foreach (var child in Kernel.PluginFolderCreators) { - rootFolder.AddVirtualChild(child); + rootFolder.AddVirtualChild(child.GetFolder()); } return rootFolder; diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 26107b9c9..cfd14f2b7 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -95,6 +95,7 @@ + diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 91ca577a7..85efe04f1 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -389,9 +389,9 @@ - - - + + + -- cgit v1.2.3 From c165f37bb96ad40d863a436795c21b9085f3fde9 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Fri, 22 Feb 2013 22:49:00 -0500 Subject: more dependancy injection. still just beginning --- MediaBrowser.Common/Kernel/BaseKernel.cs | 52 +++---------- MediaBrowser.Common/Kernel/IApplicationHost.cs | 21 +++++ MediaBrowser.Common/MediaBrowser.Common.csproj | 3 - MediaBrowser.Common/packages.config | 1 - MediaBrowser.Controller/Kernel.cs | 75 +++++------------- .../MediaBrowser.Controller.csproj | 4 - MediaBrowser.Controller/MediaInfo/FFMpegManager.cs | 90 +--------------------- .../MediaInfo/FFMpegVideoImageProvider.cs | 19 ++++- .../MediaInfo/FFProbeVideoInfoProvider.cs | 15 +++- MediaBrowser.Controller/packages.config | 1 - MediaBrowser.ServerApplication/App.xaml.cs | 67 +++++++++++++++- .../MediaBrowser.ServerApplication.csproj | 4 + MediaBrowser.ServerApplication/packages.config | 1 + 13 files changed, 147 insertions(+), 206 deletions(-) (limited to 'MediaBrowser.Controller/Kernel.cs') diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index 202bd3cab..85954cb82 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -18,7 +18,6 @@ using System.Linq; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using SimpleInjector; namespace MediaBrowser.Common.Kernel { @@ -223,12 +222,6 @@ namespace MediaBrowser.Common.Kernel /// The task manager. public TaskManager TaskManager { get; private set; } - /// - /// Gets the iso manager. - /// - /// The iso manager. - public IIsoManager IsoManager { get; private set; } - /// /// Gets the rest services. /// @@ -347,20 +340,14 @@ namespace MediaBrowser.Common.Kernel /// Initializes a new instance of the class. /// /// The app host. - /// The iso manager. /// The logger. /// isoManager - protected BaseKernel(IApplicationHost appHost, IIsoManager isoManager, ILogger logger) + protected BaseKernel(IApplicationHost appHost, ILogger logger) { if (appHost == null) { throw new ArgumentNullException("appHost"); } - - if (isoManager == null) - { - throw new ArgumentNullException("isoManager"); - } if (logger == null) { @@ -368,7 +355,6 @@ namespace MediaBrowser.Common.Kernel } ApplicationHost = appHost; - IsoManager = isoManager; Logger = logger; } @@ -471,11 +457,6 @@ namespace MediaBrowser.Common.Kernel CompositionContainer.Catalog.Dispose(); } - /// - /// The ioc container - /// - private readonly Container _iocContainer = new Container(); - /// /// Composes the parts. /// @@ -486,19 +467,18 @@ namespace MediaBrowser.Common.Kernel CompositionContainer = GetSafeCompositionContainer(concreteTypes.Select(i => new TypeCatalog(i))); - ComposeExportedValues(CompositionContainer, _iocContainer); + RegisterExportedValues(CompositionContainer); CompositionContainer.ComposeParts(this); - ComposePartsWithIocContainer(concreteTypes, _iocContainer); + FindParts(concreteTypes); } /// /// Composes the parts with ioc container. /// /// All types. - /// The container. - protected virtual void ComposePartsWithIocContainer(Type[] allTypes, Container container) + protected virtual void FindParts(Type[] allTypes) { RestServices = GetExports(allTypes); WebSocketListeners = GetExports(allTypes); @@ -530,21 +510,20 @@ namespace MediaBrowser.Common.Kernel /// System.Object. private object Instantiate(Type type) { - return _iocContainer.GetInstance(type); + return ApplicationHost.CreateInstance(type); } /// /// Composes the exported values. /// /// The container. - /// - protected virtual void ComposeExportedValues(CompositionContainer container, Container iocContainer) + protected virtual void RegisterExportedValues(CompositionContainer container) { + ApplicationHost.Register(this); + container.ComposeExportedValue("logger", Logger); container.ComposeExportedValue("appHost", ApplicationHost); - - iocContainer.RegisterSingle(Logger); - iocContainer.RegisterSingle(ApplicationHost); + container.ComposeExportedValue("isoManager", ApplicationHost.Resolve()); } /// @@ -739,7 +718,6 @@ namespace MediaBrowser.Common.Kernel { DisposeTcpManager(); DisposeTaskManager(); - DisposeIsoManager(); DisposeHttpManager(); DisposeComposableParts(); @@ -753,18 +731,6 @@ namespace MediaBrowser.Common.Kernel } } - /// - /// Disposes the iso manager. - /// - private void DisposeIsoManager() - { - if (IsoManager != null) - { - IsoManager.Dispose(); - IsoManager = null; - } - } - /// /// Disposes the TCP manager. /// diff --git a/MediaBrowser.Common/Kernel/IApplicationHost.cs b/MediaBrowser.Common/Kernel/IApplicationHost.cs index 63c63eb3d..d2b1ab7a2 100644 --- a/MediaBrowser.Common/Kernel/IApplicationHost.cs +++ b/MediaBrowser.Common/Kernel/IApplicationHost.cs @@ -43,5 +43,26 @@ namespace MediaBrowser.Common.Kernel /// /// Task. Task UpdateApplication(CancellationToken cancellationToken, IProgress progress); + + /// + /// Creates an instance of type and resolves all constructor dependancies + /// + /// The type. + /// System.Object. + object CreateInstance(Type type); + + /// + /// Registers a service that other classes can use as a dependancy. + /// + /// + /// The obj. + void Register(T obj) where T : class; + + /// + /// Resolves this instance. + /// + /// + /// ``0. + T Resolve() where T : class; } } diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index ea388e33b..cae26b3df 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -88,9 +88,6 @@ False ..\packages\ServiceStack.Text.3.9.37\lib\net35\ServiceStack.Text.dll - - ..\packages\SimpleInjector.2.0.0-beta5\lib\net40-client\SimpleInjector.dll - diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config index 96fdb618b..536640094 100644 --- a/MediaBrowser.Common/packages.config +++ b/MediaBrowser.Common/packages.config @@ -13,5 +13,4 @@ - \ No newline at end of file diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 6bd48a502..ebf3e724d 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -28,7 +28,6 @@ using System.ComponentModel.Composition.Hosting; using System.Linq; using System.Threading; using System.Threading.Tasks; -using SimpleInjector; namespace MediaBrowser.Controller { @@ -301,48 +300,16 @@ namespace MediaBrowser.Controller get { return 7359; } } - /// - /// Gets or sets the zip client. - /// - /// The zip client. - private IZipClient ZipClient { get; set; } - - /// - /// Gets or sets the bluray examiner. - /// - /// The bluray examiner. - private IBlurayExaminer BlurayExaminer { get; set; } - /// /// Creates a kernel based on a Data path, which is akin to our current programdata path /// /// The app host. - /// The iso manager. - /// The zip client. - /// The bluray examiner. /// The logger. /// isoManager - public Kernel(IApplicationHost appHost, IIsoManager isoManager, IZipClient zipClient, IBlurayExaminer blurayExaminer, ILogger logger) - : base(appHost, isoManager, logger) + public Kernel(IApplicationHost appHost, ILogger logger) + : base(appHost, logger) { - if (isoManager == null) - { - throw new ArgumentNullException("isoManager"); - } - - if (zipClient == null) - { - throw new ArgumentNullException("zipClient"); - } - - if (blurayExaminer == null) - { - throw new ArgumentNullException("blurayExaminer"); - } - Instance = this; - ZipClient = zipClient; - BlurayExaminer = blurayExaminer; // For now there's no real way to inject this properly BaseItem.Logger = logger; @@ -356,26 +323,22 @@ namespace MediaBrowser.Controller /// Composes the exported values. /// /// The container. - /// The _ioc container. - protected override void ComposeExportedValues(CompositionContainer container, Container iocContainer) + protected override void RegisterExportedValues(CompositionContainer container) { - base.ComposeExportedValues(container, iocContainer); - container.ComposeExportedValue("kernel", this); - container.ComposeExportedValue("blurayExaminer", BlurayExaminer); - iocContainer.RegisterSingle(this); - iocContainer.RegisterSingle(BlurayExaminer); + ApplicationHost.Register(this); + + base.RegisterExportedValues(container); } /// /// Composes the parts with ioc container. /// /// All types. - /// The container. - protected override void ComposePartsWithIocContainer(Type[] allTypes, Container container) + protected override void FindParts(Type[] allTypes) { - base.ComposePartsWithIocContainer(allTypes, container); + base.FindParts(allTypes); EntityResolutionIgnoreRules = GetExports(allTypes); UserDataRepositories = GetExports(allTypes); @@ -395,24 +358,22 @@ namespace MediaBrowser.Controller /// Task. protected override async Task ReloadInternal() { - Logger.Info("Extracting tools"); - // Reset these so that they can be lazy loaded again Users = null; RootFolder = null; - ReloadResourcePools(); - InstallationManager = new InstallationManager(this, ZipClient, Logger); - LibraryManager = new LibraryManager(this, Logger); - UserManager = new UserManager(this, Logger); - FFMpegManager = new FFMpegManager(this, ZipClient, Logger); - ImageManager = new ImageManager(this, Logger); - ProviderManager = new ProviderManager(this, Logger); - UserDataManager = new UserDataManager(this, Logger); - PluginSecurityManager = new PluginSecurityManager(this); - await base.ReloadInternal().ConfigureAwait(false); + ReloadResourcePools(); + InstallationManager = (InstallationManager)ApplicationHost.CreateInstance(typeof(InstallationManager)); + FFMpegManager = (FFMpegManager)ApplicationHost.CreateInstance(typeof(FFMpegManager)); + LibraryManager = (LibraryManager)ApplicationHost.CreateInstance(typeof(LibraryManager)); + UserManager = (UserManager)ApplicationHost.CreateInstance(typeof(UserManager)); + ImageManager = (ImageManager)ApplicationHost.CreateInstance(typeof(ImageManager)); + ProviderManager = (ProviderManager)ApplicationHost.CreateInstance(typeof(ProviderManager)); + UserDataManager = (UserDataManager)ApplicationHost.CreateInstance(typeof(UserDataManager)); + PluginSecurityManager = (PluginSecurityManager)ApplicationHost.CreateInstance(typeof(PluginSecurityManager)); + ReloadFileSystemManager(); await UserManager.RefreshUsersMetadata(CancellationToken.None).ConfigureAwait(false); diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index cfd14f2b7..f9765d852 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -63,10 +63,6 @@ False ..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll - - False - ..\packages\SimpleInjector.2.0.0-beta5\lib\net40-client\SimpleInjector.dll - diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs index 9bc1ebaa5..7ef70ea42 100644 --- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs +++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs @@ -4,9 +4,9 @@ using MediaBrowser.Common.Kernel; using MediaBrowser.Common.Serialization; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using MediaBrowser.Model.IO; +using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.ComponentModel; @@ -17,7 +17,6 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Model.Logging; namespace MediaBrowser.Controller.MediaInfo { @@ -26,22 +25,6 @@ namespace MediaBrowser.Controller.MediaInfo /// public class FFMpegManager : BaseManager { - /// - /// Holds the list of new items to generate chapter image for when the NewItemTimer expires - /// - private readonly List