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

more dependancy injection. still just beginning

Browse Source
This commit is contained in:
LukePulverenti
2013-02-22 22:49:00 -05:00
parent 57cb08085d
commit c165f37bb9
13 changed files with 147 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
MediaBrowser.Common/Kernel/BaseKernel.cs
View File

@@ -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
/// <value>The task manager.</value>
public TaskManager TaskManager { get; private set; }
/// <summary>
/// Gets the iso manager.
/// </summary>
/// <value>The iso manager.</value>
public IIsoManager IsoManager { get; private set; }
/// <summary>
/// Gets the rest services.
/// </summary>
@@ -347,20 +340,14 @@ namespace MediaBrowser.Common.Kernel
/// Initializes a new instance of the <see cref="BaseKernel{TApplicationPathsType}" /> class.
/// </summary>
/// <param name="appHost">The app host.</param>
/// <param name="isoManager">The iso manager.</param>
/// <param name="logger">The logger.</param>
/// <exception cref="System.ArgumentNullException">isoManager</exception>
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();
}
/// <summary>
/// The ioc container
/// </summary>
private readonly Container _iocContainer = new Container();
/// <summary>
/// Composes the parts.
/// </summary>
@@ -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);
}
/// <summary>
/// Composes the parts with ioc container.
/// </summary>
/// <param name="allTypes">All types.</param>
/// <param name="container">The container.</param>
protected virtual void ComposePartsWithIocContainer(Type[] allTypes, Container container)
protected virtual void FindParts(Type[] allTypes)
{
RestServices = GetExports<IRestfulService>(allTypes);
WebSocketListeners = GetExports<IWebSocketListener>(allTypes);
@@ -530,21 +510,20 @@ namespace MediaBrowser.Common.Kernel
/// <returns>System.Object.</returns>
private object Instantiate(Type type)
{
return _iocContainer.GetInstance(type);
return ApplicationHost.CreateInstance(type);
}
/// <summary>
/// Composes the exported values.
/// </summary>
/// <param name="container">The container.</param>
/// <param name="iocContainer"></param>
protected virtual void ComposeExportedValues(CompositionContainer container, Container iocContainer)
protected virtual void RegisterExportedValues(CompositionContainer container)
{
ApplicationHost.Register<IKernel>(this);
container.ComposeExportedValue("logger", Logger);
container.ComposeExportedValue("appHost", ApplicationHost);
iocContainer.RegisterSingle(Logger);
iocContainer.RegisterSingle(ApplicationHost);
container.ComposeExportedValue("isoManager", ApplicationHost.Resolve<IIsoManager>());
}
/// <summary>
@@ -739,7 +718,6 @@ namespace MediaBrowser.Common.Kernel
{
DisposeTcpManager();
DisposeTaskManager();
DisposeIsoManager();
DisposeHttpManager();
DisposeComposableParts();
@@ -753,18 +731,6 @@ namespace MediaBrowser.Common.Kernel
}
}
/// <summary>
/// Disposes the iso manager.
/// </summary>
private void DisposeIsoManager()
{
if (IsoManager != null)
{
IsoManager.Dispose();
IsoManager = null;
}
}
/// <summary>
/// Disposes the TCP manager.
/// </summary>