From 4f5c7687042148507d5cedfcec81ab355f478f19 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 11 Nov 2014 23:51:40 -0500 Subject: added more card layouts --- MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 4 ++-- MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index dc9f83b3c9..1f7c62de0b 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -139,14 +139,14 @@ namespace MediaBrowser.Controller.Entities.Audio { var id = this.GetProviderId(MetadataProviders.MusicBrainzReleaseGroup); - if (!string.IsNullOrEmpty(id)) + if (!string.IsNullOrWhiteSpace(id)) { return "MusicAlbum-MusicBrainzReleaseGroup-" + id; } id = this.GetProviderId(MetadataProviders.MusicBrainzAlbum); - if (!string.IsNullOrEmpty(id)) + if (!string.IsNullOrWhiteSpace(id)) { return "MusicAlbum-Musicbrainz-" + id; } diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index 5b40073226..d37301b9eb 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -157,18 +157,24 @@ namespace MediaBrowser.Controller.Resolvers // Normalize // Remove whitespace - filename = filename.Replace("-", string.Empty); - filename = filename.Replace(".", string.Empty); - filename = Regex.Replace(filename, @"\s+", ""); + filename = filename.Replace("-", " "); + filename = filename.Replace(".", " "); + filename = filename.Replace("(", " "); + filename = filename.Replace(")", " "); + filename = Regex.Replace(filename, @"\s+", " "); var prefixes = new[] { "disc", "cd", "disk", "vol", "volume" }; + filename = filename.TrimStart(); + foreach (var prefix in prefixes) { if (filename.IndexOf(prefix, StringComparison.OrdinalIgnoreCase) == 0) { var tmp = filename.Substring(prefix.Length); + tmp = tmp.Trim().Split(' ').FirstOrDefault() ?? string.Empty; + int val; if (int.TryParse(tmp, NumberStyles.Any, CultureInfo.InvariantCulture, out val)) { -- cgit v1.2.3