diff options
Diffstat (limited to 'MediaBrowser.Controller/Entities/Audio')
4 files changed, 12 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/Artist.cs b/MediaBrowser.Controller/Entities/Audio/Artist.cs index dcd6af92d..567b67868 100644 --- a/MediaBrowser.Controller/Entities/Audio/Artist.cs +++ b/MediaBrowser.Controller/Entities/Audio/Artist.cs @@ -12,7 +12,7 @@ namespace MediaBrowser.Controller.Entities.Audio /// <returns>System.String.</returns> public override string GetUserDataKey() { - return Name; + return "Artist-" + Name; } } } diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs index 9deb8241d..01bdd84ac 100644 --- a/MediaBrowser.Controller/Entities/Audio/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs @@ -113,5 +113,15 @@ namespace MediaBrowser.Controller.Entities.Audio return (ProductionYear != null ? ProductionYear.Value.ToString("000-") : "") + (IndexNumber != null ? IndexNumber.Value.ToString("0000 - ") : "") + Name; } + + /// <summary> + /// Determines whether the specified name has artist. + /// </summary> + /// <param name="name">The name.</param> + /// <returns><c>true</c> if the specified name has artist; otherwise, <c>false</c>.</returns> + public bool HasArtist(string name) + { + return Artists.Contains(name, StringComparer.OrdinalIgnoreCase) || string.Equals(AlbumArtist, name, StringComparison.OrdinalIgnoreCase); + } } } diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index 7b64c0e85..7d6577b4e 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -40,7 +40,7 @@ namespace MediaBrowser.Controller.Entities.Audio /// <summary> /// The unknwon artist /// </summary> - private static readonly MusicArtist UnknwonArtist = new MusicArtist {Name = "<Unknown>"}; + private static readonly MusicArtist UnknwonArtist = new MusicArtist { Name = "<Unknown>" }; /// <summary> /// Override this to return the folder that should be used to construct a container diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs index b5627e061..1f1d5e083 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - namespace MediaBrowser.Controller.Entities.Audio { /// <summary> @@ -8,12 +6,6 @@ namespace MediaBrowser.Controller.Entities.Audio /// </summary> public class MusicArtist : Folder { - public Dictionary<string, string> AlbumCovers { get; set; } - public override void ClearMetaValues() - { - AlbumCovers = null; - base.ClearMetaValues(); - } } } |