From d270b10db67eeaa16a35920d5d86b1975dfffd16 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 27 Jul 2017 01:18:39 -0400 Subject: move auto-organize to plugin --- MediaBrowser.WebDashboard/Api/DashboardService.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'MediaBrowser.WebDashboard') diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index cf3e221b33..c6bbca6728 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -174,6 +174,9 @@ namespace MediaBrowser.WebDashboard.Api IPlugin plugin = null; Stream stream = null; + var isJs = false; + var isTemplate = false; + var page = ServerEntryPoint.Instance.PluginConfigurationPages.FirstOrDefault(p => string.Equals(p.Name, request.Name, StringComparison.OrdinalIgnoreCase)); if (page != null) { @@ -188,11 +191,23 @@ namespace MediaBrowser.WebDashboard.Api { plugin = altPage.Item2; stream = _assemblyInfo.GetManifestResourceStream(plugin.GetType(), altPage.Item1.EmbeddedResourcePath); + + isJs = string.Equals(Path.GetExtension(altPage.Item1.EmbeddedResourcePath), ".js", StringComparison.OrdinalIgnoreCase); + isTemplate = altPage.Item1.EmbeddedResourcePath.EndsWith(".template.html"); } } if (plugin != null && stream != null) { + if (isJs) + { + return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.js"), () => Task.FromResult(stream)); + } + if (isTemplate) + { + return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => Task.FromResult(stream)); + } + return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator(DashboardUIPath).ModifyHtml("dummy.html", stream, null, _appHost.ApplicationVersion.ToString(), null)); } -- cgit v1.2.3