From ab06f592753bca535f1bcf0a9d9fd689b8b9765f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 18 May 2016 13:02:56 -0400 Subject: [PATCH 1/3] update dialogs --- MediaBrowser.Controller/Entities/User.cs | 9 +-------- .../Library/LibraryManager.cs | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs index e5b39003d0..5c68308f5c 100644 --- a/MediaBrowser.Controller/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -305,14 +305,7 @@ namespace MediaBrowser.Controller.Entities public bool IsFolderGrouped(Guid id) { - var config = Configuration; - - if (config.ExcludeFoldersFromGrouping != null) - { - return !config.ExcludeFoldersFromGrouping.Select(i => new Guid(i)).Contains(id); - } - - return config.GroupedFolders.Select(i => new Guid(i)).Contains(id); + return Configuration.GroupedFolders.Select(i => new Guid(i)).Contains(id); } [IgnoreDataMember] diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index f61bac42dc..56d3bd4de1 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1452,7 +1452,7 @@ namespace MediaBrowser.Server.Implementations.Library .GetChildren(user, true) .OfType() .Where(i => string.IsNullOrWhiteSpace(i.CollectionType) || string.Equals(i.CollectionType, view.ViewType, StringComparison.OrdinalIgnoreCase)) - .Where(i => user.Configuration.GroupedFolders.Contains(i.Id.ToString("N"), StringComparer.OrdinalIgnoreCase)) + .Where(i => user.IsFolderGrouped(i.Id)) .SelectMany(i => GetTopParentsForQuery(i, user)); } return new BaseItem[] { }; From 7841d9eb66cece2cc72307e9b9a078acd50943c7 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Wed, 18 May 2016 14:23:46 -0400 Subject: [PATCH 2/3] Friendly stream names --- MediaBrowser.Model/Entities/MediaStream.cs | 14 ++++++---- MediaBrowser.Model/Extensions/CodecHelper.cs | 28 +++++++++++++++++++ MediaBrowser.Model/Extensions/StringHelper.cs | 5 ++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 1 + 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 MediaBrowser.Model/Extensions/CodecHelper.cs diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 9b814c5ccc..d0d4669062 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -53,18 +53,22 @@ namespace MediaBrowser.Model.Entities if (!string.IsNullOrEmpty(Language)) { - attributes.Add(Language); + attributes.Add(Language.FirstToUpper()); } if (!string.IsNullOrEmpty(Codec) && !StringHelper.EqualsIgnoreCase(Codec, "dca")) { - attributes.Add(Codec); - } - if (!string.IsNullOrEmpty(Profile) && !StringHelper.EqualsIgnoreCase(Profile, "lc")) + attributes.Add(CodecHelper.FriendlyName(Codec)); + } + else if (!string.IsNullOrEmpty(Profile) && !StringHelper.EqualsIgnoreCase(Profile, "lc")) { attributes.Add(Profile); } - if (Channels.HasValue) + if (!string.IsNullOrEmpty(ChannelLayout)) + { + attributes.Add(ChannelLayout); + } + else if (Channels.HasValue) { attributes.Add(StringHelper.ToStringCultureInvariant(Channels.Value) + " ch"); } diff --git a/MediaBrowser.Model/Extensions/CodecHelper.cs b/MediaBrowser.Model/Extensions/CodecHelper.cs new file mode 100644 index 0000000000..8d037008ef --- /dev/null +++ b/MediaBrowser.Model/Extensions/CodecHelper.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MediaBrowser.Model.Extensions +{ + public static class CodecHelper + { + public static string FriendlyName(string codec) + { + if (string.IsNullOrEmpty(codec)) return ""; + + switch (codec.ToLower()) + { + case "ac3": + return "Dolby Digital"; + case "eac3": + return "Dolby Digital+"; + case "dca": + return "DTS"; + default: + return codec.ToUpper(); + } + } + } +} diff --git a/MediaBrowser.Model/Extensions/StringHelper.cs b/MediaBrowser.Model/Extensions/StringHelper.cs index 99bec68a73..9cde3bfa45 100644 --- a/MediaBrowser.Model/Extensions/StringHelper.cs +++ b/MediaBrowser.Model/Extensions/StringHelper.cs @@ -125,5 +125,10 @@ namespace MediaBrowser.Model.Extensions return sb.ToString(); } + + public static string FirstToUpper(this string str) + { + return string.IsNullOrEmpty(str) ? "" : str.Substring(0, 1).ToUpper() + str.Substring(1); + } } } diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 7c469b9fb9..dc78bcf8eb 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -137,6 +137,7 @@ + From 34d4e4317aa9cd3e354ada10defb1ac1f142bf9f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 18 May 2016 17:46:56 -0400 Subject: [PATCH 3/3] update dialogs --- MediaBrowser.Model/Entities/MediaStream.cs | 8 +++--- MediaBrowser.Model/Extensions/CodecHelper.cs | 28 -------------------- MediaBrowser.Model/MediaBrowser.Model.csproj | 1 - MediaBrowser.Model/MediaInfo/AudioCodec.cs | 17 ++++++++++++ 4 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 MediaBrowser.Model/Extensions/CodecHelper.cs diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index d0d4669062..64c7d9aa6c 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -1,8 +1,8 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Extensions; using System.Diagnostics; +using MediaBrowser.Model.MediaInfo; namespace MediaBrowser.Model.Entities { @@ -53,11 +53,11 @@ namespace MediaBrowser.Model.Entities if (!string.IsNullOrEmpty(Language)) { - attributes.Add(Language.FirstToUpper()); + attributes.Add(StringHelper.FirstToUpper(Language)); } if (!string.IsNullOrEmpty(Codec) && !StringHelper.EqualsIgnoreCase(Codec, "dca")) { - attributes.Add(CodecHelper.FriendlyName(Codec)); + attributes.Add(AudioCodec.GetFriendlyName(Codec)); } else if (!string.IsNullOrEmpty(Profile) && !StringHelper.EqualsIgnoreCase(Profile, "lc")) { diff --git a/MediaBrowser.Model/Extensions/CodecHelper.cs b/MediaBrowser.Model/Extensions/CodecHelper.cs deleted file mode 100644 index 8d037008ef..0000000000 --- a/MediaBrowser.Model/Extensions/CodecHelper.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MediaBrowser.Model.Extensions -{ - public static class CodecHelper - { - public static string FriendlyName(string codec) - { - if (string.IsNullOrEmpty(codec)) return ""; - - switch (codec.ToLower()) - { - case "ac3": - return "Dolby Digital"; - case "eac3": - return "Dolby Digital+"; - case "dca": - return "DTS"; - default: - return codec.ToUpper(); - } - } - } -} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index dc78bcf8eb..7c469b9fb9 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -137,7 +137,6 @@ - diff --git a/MediaBrowser.Model/MediaInfo/AudioCodec.cs b/MediaBrowser.Model/MediaInfo/AudioCodec.cs index 5353f2b3ec..93aba2f434 100644 --- a/MediaBrowser.Model/MediaInfo/AudioCodec.cs +++ b/MediaBrowser.Model/MediaInfo/AudioCodec.cs @@ -5,5 +5,22 @@ public const string AAC = "aac"; public const string MP3 = "mp3"; public const string AC3 = "ac3"; + + public static string GetFriendlyName(string codec) + { + if (string.IsNullOrEmpty(codec)) return ""; + + switch (codec.ToLower()) + { + case "ac3": + return "Dolby Digital"; + case "eac3": + return "Dolby Digital+"; + case "dca": + return "DTS"; + default: + return codec.ToUpper(); + } + } } } \ No newline at end of file