From dcca3f02366d5e54fb6eefeb0ccc7c5261e49e48 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 1 Oct 2013 14:31:32 -0400 Subject: update music artist when saving artist --- .../Library/Validators/ArtistsValidator.cs | 25 +--------------------- 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library') diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs index 903fe86be..7387b9166 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs @@ -6,9 +6,7 @@ using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Threading; @@ -85,7 +83,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators artist.ValidateImages(); artist.ValidateBackdrops(); - var musicArtist = FindMusicArtist(artist, allMusicArtists); + var musicArtist = Artist.FindMusicArtist(artist, allMusicArtists); if (musicArtist != null) { @@ -235,26 +233,5 @@ namespace MediaBrowser.Server.Implementations.Library.Validators return returnArtists; } - - /// - /// Finds the music artist. - /// - /// The artist. - /// All music artists. - /// MusicArtist. - private static MusicArtist FindMusicArtist(Artist artist, IEnumerable allMusicArtists) - { - var musicBrainzId = artist.GetProviderId(MetadataProviders.Musicbrainz); - - return allMusicArtists.FirstOrDefault(i => - { - if (!string.IsNullOrWhiteSpace(musicBrainzId) && string.Equals(musicBrainzId, i.GetProviderId(MetadataProviders.Musicbrainz), StringComparison.OrdinalIgnoreCase)) - { - return true; - } - - return string.Compare(i.Name, artist.Name, CultureInfo.CurrentCulture, CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0; - }); - } } } -- cgit v1.2.3