From 3d97d50541bc070e4c035a8324d2fcd40badedd9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 10 Mar 2016 15:06:47 -0500 Subject: [PATCH 1/3] auto-organize updates --- .../FileOrganization/EpisodeFileOrganizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs index f9e167a8f7..349e319078 100644 --- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs +++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs @@ -547,7 +547,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization if (series == null) { - SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(e => e.MatchStrings.Contains(seriesName, StringComparer.OrdinalIgnoreCase)); + SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(e => e.MatchStrings.Contains(nameWithoutYear, StringComparer.OrdinalIgnoreCase)); if (info != null) { From 5ed013855f8060590e4190e4998eba3cb7a31b10 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 10 Mar 2016 15:07:05 -0500 Subject: [PATCH 2/3] add logging --- MediaBrowser.Api/Images/ImageService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 8d58070fdf..e5fe5bd684 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -699,6 +699,7 @@ namespace MediaBrowser.Api.Images private ImageFormat[] GetClientSupportedFormats() { + //Logger.Debug("Request types: {0}", string.Join(",", Request.AcceptTypes ?? new string[] { })); var supportsWebP = (Request.AcceptTypes ?? new string[] { }).Contains("image/webp", StringComparer.OrdinalIgnoreCase); var userAgent = Request.UserAgent ?? string.Empty; From e0636b4925d7a15740201f96855d05dfca97d9ad Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 10 Mar 2016 23:25:56 -0500 Subject: [PATCH 3/3] update packaging --- MediaBrowser.WebDashboard/Api/DashboardService.cs | 3 +++ MediaBrowser.WebDashboard/Api/PackageCreator.cs | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 788825a7b0..90d7659205 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -354,6 +354,9 @@ namespace MediaBrowser.WebDashboard.Api DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "meteor"); DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "st"); DeleteFoldersByName(Path.Combine(bowerPath, "Swiper"), "src"); + DeleteFoldersByName(Path.Combine(bowerPath, "material-design-lite"), "src"); + DeleteFoldersByName(Path.Combine(bowerPath, "material-design-lite"), "utils"); + _fileSystem.DeleteFile(Path.Combine(bowerPath, "material-design-lite", "gulpfile.babel.js")); _fileSystem.DeleteDirectory(Path.Combine(bowerPath, "marked"), true); _fileSystem.DeleteDirectory(Path.Combine(bowerPath, "marked-element"), true); diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index c3db094574..9c698440e7 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -436,14 +436,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new List(); - if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) - { - files.Add("bower_components/requirejs/require.js"); - } - else - { - files.Add("bower_components" + version + "/requirejs/require.js"); - } + files.Add("bower_components/requirejs/require.js"); files.Add("scripts/site.js" + versionString);