diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-22 13:59:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 13:59:43 -0400 |
| commit | 5dabb0fc1bf0d4091ba26b170c4c37c7047216e6 (patch) | |
| tree | d2bf795feb2774b4f98b797999c1a2e787ee9867 /MediaBrowser.Api | |
| parent | 00b80a33c15eddb22ef7ede348309d8dc5034eca (diff) | |
| parent | df5cfc0c2580c5bab0a588279c97dec9145736d4 (diff) | |
Merge pull request #1967 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/Library/LibraryService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Api/SimilarItemsHelper.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 6 |
4 files changed, 18 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs index 1949dea123..e5a40ba2f0 100644 --- a/MediaBrowser.Api/Library/LibraryService.cs +++ b/MediaBrowser.Api/Library/LibraryService.cs @@ -350,7 +350,8 @@ namespace MediaBrowser.Api.Library Fields = request.Fields, Id = request.Id, Limit = request.Limit, - UserId = request.UserId + UserId = request.UserId, + ExcludeArtistNames = request.ExcludeArtistNames }); } if (item is MusicArtist) diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs index c98a91a55f..eea2814a61 100644 --- a/MediaBrowser.Api/SimilarItemsHelper.cs +++ b/MediaBrowser.Api/SimilarItemsHelper.cs @@ -25,6 +25,8 @@ namespace MediaBrowser.Api /// <value>The id.</value> [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 class BaseGetSimilarItems : IReturn<ItemsResult>, IHasItemFields @@ -70,6 +72,12 @@ namespace MediaBrowser.Api Recursive = true }; + // ExcludeArtistNames + if (!string.IsNullOrEmpty(request.ExcludeArtistNames)) + { + query.ExcludeArtistNames = request.ExcludeArtistNames.Split('|'); + } + var inputItems = libraryManager.GetItemList(query); var items = GetSimilaritems(item, libraryManager, inputItems, getSimilarityScore) diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs index 5a66f872f2..60bcc91b03 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs @@ -266,6 +266,8 @@ 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; } + [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 74b33fbb7b..4db1ed9f47 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -368,6 +368,12 @@ namespace MediaBrowser.Api.UserLibrary query.ArtistNames = request.Artists.Split('|'); } + // ExcludeArtistNames + if (!string.IsNullOrEmpty(request.ExcludeArtistNames)) + { + query.ExcludeArtistNames = request.ExcludeArtistNames.Split('|'); + } + // Albums if (!string.IsNullOrEmpty(request.Albums)) { |