diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs index e5a40ba2f0..14a771db03 100644 --- a/MediaBrowser.Api/Library/LibraryService.cs +++ b/MediaBrowser.Api/Library/LibraryService.cs @@ -351,7 +351,7 @@ namespace MediaBrowser.Api.Library Id = request.Id, Limit = request.Limit, UserId = request.UserId, - ExcludeArtistNames = request.ExcludeArtistNames + ExcludeArtistIds = request.ExcludeArtistIds }); } if (item is MusicArtist) diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs index eea2814a61..a1e47bd8fd 100644 --- a/MediaBrowser.Api/SimilarItemsHelper.cs +++ b/MediaBrowser.Api/SimilarItemsHelper.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.Api [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] public string Id { get; set; } - public string ExcludeArtistNames { get; set; } + public string ExcludeArtistIds { get; set; } } public class BaseGetSimilarItems : IReturn, IHasItemFields @@ -72,10 +72,10 @@ namespace MediaBrowser.Api Recursive = true }; - // ExcludeArtistNames - if (!string.IsNullOrEmpty(request.ExcludeArtistNames)) + // ExcludeArtistIds + if (!string.IsNullOrEmpty(request.ExcludeArtistIds)) { - query.ExcludeArtistNames = request.ExcludeArtistNames.Split('|'); + query.ExcludeArtistIds = request.ExcludeArtistIds.Split('|'); } var inputItems = libraryManager.GetItemList(query); diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs index 60bcc91b03..3e9a541c0c 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs @@ -266,7 +266,7 @@ namespace MediaBrowser.Api.UserLibrary [ApiMember(Name = "Artists", Description = "Optional. If specified, results will be filtered based on artist. This allows multiple, pipe delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string Artists { get; set; } - public string ExcludeArtistNames { get; set; } + public string ExcludeArtistIds { get; set; } [ApiMember(Name = "ArtistIds", Description = "Optional. If specified, results will be filtered based on artist. This allows multiple, pipe delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)] public string ArtistIds { get; set; } diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 4db1ed9f47..b4d88a7f89 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -368,10 +368,10 @@ namespace MediaBrowser.Api.UserLibrary query.ArtistNames = request.Artists.Split('|'); } - // ExcludeArtistNames - if (!string.IsNullOrEmpty(request.ExcludeArtistNames)) + // ExcludeArtistIds + if (!string.IsNullOrEmpty(request.ExcludeArtistIds)) { - query.ExcludeArtistNames = request.ExcludeArtistNames.Split('|'); + query.ExcludeArtistIds = request.ExcludeArtistIds.Split('|'); } // Albums diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs index bf2a502023..69cab5ec53 100644 --- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs +++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs @@ -138,7 +138,7 @@ namespace MediaBrowser.Controller.Entities public string[] AlbumNames { get; set; } public string[] ArtistNames { get; set; } - public string[] ExcludeArtistNames { get; set; } + public string[] ExcludeArtistIds { get; set; } public string AncestorWithPresentationUniqueKey { get; set; } public bool GroupByPresentationUniqueKey { get; set; } @@ -154,7 +154,7 @@ namespace MediaBrowser.Controller.Entities AlbumNames = new string[] { }; ArtistNames = new string[] { }; - ExcludeArtistNames = new string[] { }; + ExcludeArtistIds = new string[] { }; ExcludeProviderIds = new Dictionary(StringComparer.OrdinalIgnoreCase); BlockUnratedItems = new UnratedItem[] { }; diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 4f8f31a756..7f556cfb06 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -2883,15 +2883,19 @@ namespace MediaBrowser.Server.Implementations.Persistence whereClauses.Add(clause); } - if (query.ExcludeArtistNames.Length > 0) + if (query.ExcludeArtistIds.Length > 0) { var clauses = new List(); var index = 0; - foreach (var artist in query.ExcludeArtistNames) + foreach (var artistId in query.ExcludeArtistIds) { - clauses.Add("@ExcludeArtistName" + index + " not in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); - cmd.Parameters.Add(cmd, "@ExcludeArtistName" + index, DbType.String).Value = artist.RemoveDiacritics(); - index++; + var artistItem = RetrieveItem(new Guid(artistId)); + if (artistItem != null) + { + clauses.Add("@ExcludeArtistName" + index + " not in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); + cmd.Parameters.Add(cmd, "@ExcludeArtistName" + index, DbType.String).Value = artistItem.Name.RemoveDiacritics(); + index++; + } } var clause = "(" + string.Join(" AND ", clauses.ToArray()) + ")"; whereClauses.Add(clause);