From c320434719e91f0e342cc03048ab33ed63f7449f Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Tue, 5 Mar 2013 18:11:20 -0500 Subject: [PATCH] trimmed IPluginConfigurationPage --- .../Plugins/IPluginConfigurationPage.cs | 19 ++++--------------- .../Api/DashboardService.cs | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/MediaBrowser.Controller/Plugins/IPluginConfigurationPage.cs b/MediaBrowser.Controller/Plugins/IPluginConfigurationPage.cs index 38fe36857..5feaf798c 100644 --- a/MediaBrowser.Controller/Plugins/IPluginConfigurationPage.cs +++ b/MediaBrowser.Controller/Plugins/IPluginConfigurationPage.cs @@ -1,4 +1,4 @@ -using System; +using MediaBrowser.Common.Plugins; using System.IO; namespace MediaBrowser.Controller.Plugins @@ -21,27 +21,16 @@ namespace MediaBrowser.Controller.Plugins ConfigurationPageType ConfigurationPageType { get; } /// - /// Gets the plugin id. + /// Gets the plugin. /// - /// The plugin id. - Guid? PluginId { get; } + /// The plugin. + IPlugin Plugin { get; } /// /// Gets the HTML stream. /// /// Stream. Stream GetHtmlStream(); - - /// - /// Gets the version. Typically taken from Plugin.Version - /// - /// The version. - string Version { get; } - - /// - /// For http caching purposes. Typically taken from Plugin.AssemblyDateLastModified - /// - DateTime DateLastModified { get; } } /// diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 4cc34ba28..cf0f28a1b 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -149,7 +149,7 @@ namespace MediaBrowser.WebDashboard.Api { 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())); + return ToStaticResult(page.Plugin.Version.ToString().GetMD5(), page.Plugin.AssemblyDateLastModified, null, MimeTypes.GetMimeType("page.html"), () => ModifyHtml(page.GetHtmlStream())); } ///