diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-23 02:18:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 02:18:37 -0400 |
| commit | 7d0a6456080a72d9a3721f13c87dd9292fc65255 (patch) | |
| tree | 2138ffc8d83096b91f8ac77939544d8b2c0369bb /MediaBrowser.Api | |
| parent | 79f6da09a5730e11608b4c762e07c6e89f7a886f (diff) | |
| parent | 2aeee846f421ec3a0e943d0cdcdedcdb250904ce (diff) | |
Merge pull request #1970 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/Library/LibraryService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/StreamState.cs | 4 | ||||
| -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 |
5 files changed, 13 insertions, 9 deletions
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/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs index d0d0337c26..da6be97b61 100644 --- a/MediaBrowser.Api/Playback/StreamState.cs +++ b/MediaBrowser.Api/Playback/StreamState.cs @@ -80,6 +80,10 @@ namespace MediaBrowser.Api.Playback { return 10; } + if (userAgent.IndexOf("cfnetwork", StringComparison.OrdinalIgnoreCase) != -1) + { + return 10; + } return 6; } 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<ItemsResult>, 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 |