aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.WebDashboard/Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.WebDashboard/Api')
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs18
-rw-r--r--MediaBrowser.WebDashboard/Api/PackageCreator.cs110
2 files changed, 84 insertions, 44 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 6e34390797..dcafa94171 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -1,12 +1,11 @@
-using System.Globalization;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Localization;
using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Model.Extensions;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Serialization;
@@ -14,6 +13,7 @@ using ServiceStack;
using ServiceStack.Web;
using System;
using System.Collections.Generic;
+using System.Globalization;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
@@ -134,7 +134,7 @@ namespace MediaBrowser.WebDashboard.Api
{
var page = ServerEntryPoint.Instance.PluginConfigurationPages.First(p => p.Name.Equals(request.Name, StringComparison.OrdinalIgnoreCase));
- return ResultFactory.GetStaticResult(Request, page.Plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator().ModifyHtml(page.GetHtmlStream(), null));
+ return ResultFactory.GetStaticResult(Request, page.Plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator().ModifyHtml(page.GetHtmlStream(), null, false));
}
/// <summary>
@@ -249,8 +249,10 @@ namespace MediaBrowser.WebDashboard.Api
/// <returns>Task{Stream}.</returns>
private Task<Stream> GetResourceStream(string path, string localizationCulture)
{
+ var minify = _serverConfigurationManager.Configuration.EnableDashboardResourceMinification;
+
return GetPackageCreator()
- .GetResource(path, localizationCulture, _appHost.ApplicationVersion.ToString());
+ .GetResource(path, localizationCulture, _appHost.ApplicationVersion.ToString(), minify);
}
private PackageCreator GetPackageCreator()
@@ -275,11 +277,11 @@ namespace MediaBrowser.WebDashboard.Api
try
{
- Directory.Delete(path, true);
+ _fileSystem.DeleteDirectory(path, true);
}
catch (IOException)
{
-
+
}
var creator = GetPackageCreator();
@@ -321,7 +323,7 @@ namespace MediaBrowser.WebDashboard.Api
private async Task DumpFile(string resourceVirtualPath, string destinationFilePath, string culture, string appVersion)
{
- using (var stream = await GetPackageCreator().GetResource(resourceVirtualPath, culture, appVersion).ConfigureAwait(false))
+ using (var stream = await GetPackageCreator().GetResource(resourceVirtualPath, culture, appVersion, true).ConfigureAwait(false))
{
using (var fs = _fileSystem.GetFileStream(destinationFilePath, FileMode.Create, FileAccess.Write, FileShare.Read))
{
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index a6707bac3a..3eb98e95d0 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -10,6 +10,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WebMarkupMin.Core.Minifiers;
+using WebMarkupMin.Core.Settings;
namespace MediaBrowser.WebDashboard.Api
{
@@ -30,9 +31,9 @@ namespace MediaBrowser.WebDashboard.Api
_jsonSerializer = jsonSerializer;
}
- public async Task<Stream> GetResource(string path,
+ public async Task<Stream> GetResource(string path,
string localizationCulture,
- string appVersion)
+ string appVersion, bool enableMinification)
{
var isHtml = IsHtml(path);
@@ -40,11 +41,11 @@ namespace MediaBrowser.WebDashboard.Api
if (path.Equals("scripts/all.js", StringComparison.OrdinalIgnoreCase))
{
- resourceStream = await GetAllJavascript(localizationCulture, appVersion).ConfigureAwait(false);
+ resourceStream = await GetAllJavascript(localizationCulture, appVersion, enableMinification).ConfigureAwait(false);
}
else if (path.Equals("css/all.css", StringComparison.OrdinalIgnoreCase))
{
- resourceStream = await GetAllCss().ConfigureAwait(false);
+ resourceStream = await GetAllCss(enableMinification).ConfigureAwait(false);
}
else
{
@@ -57,7 +58,7 @@ namespace MediaBrowser.WebDashboard.Api
// jQuery ajax doesn't seem to handle if-modified-since correctly
if (isHtml)
{
- resourceStream = await ModifyHtml(resourceStream, localizationCulture).ConfigureAwait(false);
+ resourceStream = await ModifyHtml(resourceStream, localizationCulture, enableMinification).ConfigureAwait(false);
}
}
@@ -106,8 +107,9 @@ namespace MediaBrowser.WebDashboard.Api
/// </summary>
/// <param name="sourceStream">The source stream.</param>
/// <param name="localizationCulture">The localization culture.</param>
+ /// <param name="enableMinification">if set to <c>true</c> [enable minification].</param>
/// <returns>Task{Stream}.</returns>
- public async Task<Stream> ModifyHtml(Stream sourceStream, string localizationCulture)
+ public async Task<Stream> ModifyHtml(Stream sourceStream, string localizationCulture, bool enableMinification)
{
using (sourceStream)
{
@@ -128,16 +130,27 @@ namespace MediaBrowser.WebDashboard.Api
html = html.Replace("<html>", "<html lang=\"" + lang + "\">");
}
- //try
- //{
- // var minifier = new HtmlMinifier(new HtmlMinificationSettings(true));
+ if (enableMinification)
+ {
+ try
+ {
+ var minifier = new HtmlMinifier(new HtmlMinificationSettings());
+ var result = minifier.Minify(html, false);
- // html = minifier.Minify(html).MinifiedContent;
- //}
- //catch (Exception ex)
- //{
- // Logger.ErrorException("Error minifying html", ex);
- //}
+ if (result.Errors.Count > 0)
+ {
+ _logger.Error("Error minifying html: " + result.Errors[0].Message);
+ }
+ else
+ {
+ html = result.MinifiedContent;
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.ErrorException("Error minifying html", ex);
+ }
+ }
}
var version = GetType().Assembly.GetName().Version;
@@ -221,7 +234,6 @@ namespace MediaBrowser.WebDashboard.Api
var files = new[]
{
"scripts/all.js" + versionString,
- "thirdparty/jstree3.0.8/jstree.min.js",
"thirdparty/swipebox-master/js/jquery.swipebox.min.js" + versionString
};
@@ -236,7 +248,7 @@ namespace MediaBrowser.WebDashboard.Api
/// Gets a stream containing all concatenated javascript
/// </summary>
/// <returns>Task{Stream}.</returns>
- private async Task<Stream> GetAllJavascript(string culture, string version)
+ private async Task<Stream> GetAllJavascript(string culture, string version, bool enableMinification)
{
var memoryStream = new MemoryStream();
var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine);
@@ -250,6 +262,8 @@ namespace MediaBrowser.WebDashboard.Api
await AppendResource(memoryStream, "thirdparty/cast_sender.js", newLineBytes).ConfigureAwait(false);
await AppendResource(memoryStream, "thirdparty/browser.js", newLineBytes).ConfigureAwait(false);
+ await AppendResource(memoryStream, "thirdparty/jstree3.0.8/jstree.js", newLineBytes).ConfigureAwait(false);
+
await AppendLocalization(memoryStream, culture).ConfigureAwait(false);
await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
@@ -264,6 +278,7 @@ namespace MediaBrowser.WebDashboard.Api
foreach (var file in new[]
{
+ "thirdparty/apiclient/logger.js",
"thirdparty/apiclient/md5.js",
"thirdparty/apiclient/sha1.js",
"thirdparty/apiclient/store.js",
@@ -303,15 +318,25 @@ namespace MediaBrowser.WebDashboard.Api
var js = builder.ToString();
- try
+ if (enableMinification)
{
- var result = new CrockfordJsMinifier().Minify(js, false, Encoding.UTF8);
+ try
+ {
+ var result = new CrockfordJsMinifier().Minify(js, false, Encoding.UTF8);
- js = result.MinifiedContent;
- }
- catch (Exception ex)
- {
- _logger.ErrorException("Error minifying javascript", ex);
+ if (result.Errors.Count > 0)
+ {
+ _logger.Error("Error minifying javascript: " + result.Errors[0].Message);
+ }
+ else
+ {
+ js = result.MinifiedContent;
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.ErrorException("Error minifying javascript", ex);
+ }
}
var bytes = Encoding.UTF8.GetBytes(js);
@@ -341,6 +366,7 @@ namespace MediaBrowser.WebDashboard.Api
"mediaplayer-video.js",
"nowplayingbar.js",
"nowplayingpage.js",
+ "taskbutton.js",
"ratingdialog.js",
"aboutpage.js",
@@ -356,6 +382,7 @@ namespace MediaBrowser.WebDashboard.Api
"channelsettings.js",
"connectlogin.js",
"dashboardgeneral.js",
+ "dashboardhosting.js",
"dashboardpage.js",
"device.js",
"devices.js",
@@ -414,7 +441,7 @@ namespace MediaBrowser.WebDashboard.Api
"metadataconfigurationpage.js",
"metadataimagespage.js",
"metadatasubtitles.js",
- "metadatakodi.js",
+ "metadatanfo.js",
"moviegenres.js",
"moviecollections.js",
"movies.js",
@@ -517,7 +544,7 @@ namespace MediaBrowser.WebDashboard.Api
/// Gets all CSS.
/// </summary>
/// <returns>Task{Stream}.</returns>
- private async Task<Stream> GetAllCss()
+ private async Task<Stream> GetAllCss(bool enableMinification)
{
var files = new[]
{
@@ -538,7 +565,8 @@ namespace MediaBrowser.WebDashboard.Api
"userimage.css",
"livetv.css",
"nowplaying.css",
- "icons.css"
+ "icons.css",
+ "materialize.css"
};
var builder = new StringBuilder();
@@ -560,16 +588,26 @@ namespace MediaBrowser.WebDashboard.Api
var css = builder.ToString();
- //try
- //{
- // var result = new KristensenCssMinifier().Minify(builder.ToString(), false, Encoding.UTF8);
+ if (enableMinification)
+ {
+ try
+ {
+ var result = new KristensenCssMinifier().Minify(builder.ToString(), false, Encoding.UTF8);
- // css = result.MinifiedContent;
- //}
- //catch (Exception ex)
- //{
- // Logger.ErrorException("Error minifying css", ex);
- //}
+ if (result.Errors.Count > 0)
+ {
+ _logger.Error("Error minifying css: " + result.Errors[0].Message);
+ }
+ else
+ {
+ css = result.MinifiedContent;
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.ErrorException("Error minifying css", ex);
+ }
+ }
var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(css));
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-02 11:08:07 +0000