michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

removed plugin configuration pages from the kernel

Browse Source
This commit is contained in:
LukePulverenti 2013-03-04 23:34:00 -05:00
parent bf95cfe2e5
commit 176d090164
5 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/Kernel.cs
View File

@ -74,12 +74,6 @@ namespace MediaBrowser.Controller
/// <value>The string files.</value>
public IEnumerable<LocalizedStringData> StringFiles { get; private set; }
/// <summary>
/// Gets the list of plugin configuration pages
/// </summary>
/// <value>The configuration pages.</value>
public IEnumerable<IPluginConfigurationPage> PluginConfigurationPages { get; private set; }
/// <summary>
/// Gets the list of currently registered weather prvoiders
/// </summary>
@ -204,7 +198,6 @@ namespace MediaBrowser.Controller
DisplayPreferencesRepositories = ApplicationHost.GetExports<IDisplayPreferencesRepository>();
ItemRepositories = ApplicationHost.GetExports<IItemRepository>();
WeatherProviders = ApplicationHost.GetExports<IWeatherProvider>();
PluginConfigurationPages = ApplicationHost.GetExports<IPluginConfigurationPage>();
ImageEnhancers = ApplicationHost.GetExports<IImageEnhancer>().OrderBy(e => e.Priority).ToArray();
StringFiles = ApplicationHost.GetExports<LocalizedStringData>();
MetadataProviders = ApplicationHost.GetExports<BaseMetadataProvider>().OrderBy(e => e.Priority).ToArray();

2
MediaBrowser.ServerApplication/WebSocketEvents.cs
View File

@ -14,7 +14,7 @@ namespace MediaBrowser.ServerApplication
/// <summary>
/// Class WebSocketEvents
/// </summary>
public class WebSocketEvents : IServerEntryPoint, IDisposable
public class WebSocketEvents : IServerEntryPoint
{
/// <summary>
/// The _server manager

4
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -147,7 +147,7 @@ namespace MediaBrowser.WebDashboard.Api
/// <returns>System.Object.</returns>
public object Get(GetDashboardConfigurationPage request)
{
var page = Kernel.Instance.PluginConfigurationPages.First(p => p.Name.Equals(request.Name, StringComparison.OrdinalIgnoreCase));
var page = ServerEntryPoint.Instance.PluginConfigurationPages.First(p => p.Name.Equals(request.Name, StringComparison.OrdinalIgnoreCase));
return ToStaticResult(page.Version.GetMD5(), page.DateLastModified, null, MimeTypes.GetMimeType("page.html"), () => ModifyHtml(page.GetHtmlStream()));
}
@ -159,7 +159,7 @@ namespace MediaBrowser.WebDashboard.Api
/// <returns>System.Object.</returns>
public object Get(GetDashboardConfigurationPages request)
{
var pages = Kernel.Instance.PluginConfigurationPages;
var pages = ServerEntryPoint.Instance.PluginConfigurationPages;
if (request.PageType.HasValue)
{

1
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -85,6 +85,7 @@
<Compile Include="Api\DashboardService.cs" />
<Compile Include="Api\DashboardInfoWebSocketListener.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServerEntryPoint.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MediaBrowser.Common.Implementations\MediaBrowser.Common.Implementations.csproj">

34
MediaBrowser.WebDashboard/ServerEntryPoint.cs Normal file
View File

@ -0,0 +1,34 @@
using MediaBrowser.Common;
using MediaBrowser.Controller.Plugins;
using System.Collections.Generic;
namespace MediaBrowser.WebDashboard
{
public class ServerEntryPoint : IServerEntryPoint
{
/// <summary>
/// Gets the list of plugin configuration pages
/// </summary>
/// <value>The configuration pages.</value>
public IEnumerable<IPluginConfigurationPage> PluginConfigurationPages { get; private set; }
private readonly IApplicationHost _appHost;
public static ServerEntryPoint Instance { get; private set; }
public ServerEntryPoint(IApplicationHost appHost)
{
_appHost = appHost;
Instance = this;
}
public void Run()
{
PluginConfigurationPages = _appHost.GetExports<IPluginConfigurationPage>();
}
public void Dispose()
{
}
}
}