diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-22 00:54:02 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-22 00:54:02 -0400 |
| commit | 54cf0da75826d641b28a34afece7a4cb0eaaaec2 (patch) | |
| tree | 8d6f313fe9d71a5ecaf7a235eff4c5db6e68990b /MediaBrowser.Api/UserLibrary | |
| parent | 41ea0d99f4ee953d6e955c355cef0e5088f9b9fd (diff) | |
update query fields
Diffstat (limited to 'MediaBrowser.Api/UserLibrary')
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ArtistsService.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/GameGenresService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/GenresService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/MusicGenresService.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/PersonsService.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/StudiosService.cs | 6 |
8 files changed, 18 insertions, 17 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs index 5bbd96c7c..7c1519e9f 100644 --- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs +++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs @@ -68,10 +68,10 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>Task{BaseItemDto}.</returns> private BaseItemDto GetItem(GetArtist request) { - var item = GetArtist(request.Name, LibraryManager); - var dtoOptions = GetDtoOptions(AuthorizationContext, request); + var item = GetArtist(request.Name, LibraryManager, dtoOptions); + if (!string.IsNullOrWhiteSpace(request.UserId)) { var user = UserManager.GetUserById(request.UserId); diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs index daef97915..d79fafd32 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs @@ -267,7 +267,8 @@ namespace MediaBrowser.Api.UserLibrary { ExcludeItemTypes = excludeItemTypes, IncludeItemTypes = includeItemTypes, - MediaTypes = mediaTypes + MediaTypes = mediaTypes, + DtoOptions = dtoOptions }; Func<BaseItem, bool> filter = i => FilterItem(request, i, excludeItemTypes, includeItemTypes, mediaTypes); diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs index 2eef1ab2f..56730c1b2 100644 --- a/MediaBrowser.Api/UserLibrary/GameGenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GameGenresService.cs @@ -56,10 +56,10 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>Task{BaseItemDto}.</returns> private BaseItemDto GetItem(GetGameGenre request) { - var item = GetGameGenre(request.Name, LibraryManager); - var dtoOptions = GetDtoOptions(AuthorizationContext, request); - + + var item = GetGameGenre(request.Name, LibraryManager, dtoOptions); + if (!string.IsNullOrWhiteSpace(request.UserId)) { var user = UserManager.GetUserById(request.UserId); diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs index 664efac14..fc387e5e3 100644 --- a/MediaBrowser.Api/UserLibrary/GenresService.cs +++ b/MediaBrowser.Api/UserLibrary/GenresService.cs @@ -66,10 +66,10 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>Task{BaseItemDto}.</returns> private BaseItemDto GetItem(GetGenre request) { - var item = GetGenre(request.Name, LibraryManager); - - var dtoOptions = GetDtoOptions(AuthorizationContext ,request); + var dtoOptions = GetDtoOptions(AuthorizationContext, request); + var item = GetGenre(request.Name, LibraryManager, dtoOptions); + if (!string.IsNullOrWhiteSpace(request.UserId)) { var user = UserManager.GetUserById(request.UserId); diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index da5c5c763..b7bb758c3 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -358,7 +358,7 @@ namespace MediaBrowser.Api.UserLibrary { try { - return _libraryManager.GetArtist(i); + return _libraryManager.GetArtist(i, new DtoOptions(false)); } catch { diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs index 305c136df..d1d4aa634 100644 --- a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs +++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs @@ -57,10 +57,10 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>Task{BaseItemDto}.</returns> private BaseItemDto GetItem(GetMusicGenre request) { - var item = GetMusicGenre(request.Name, LibraryManager); - var dtoOptions = GetDtoOptions(AuthorizationContext, request); + var item = GetMusicGenre(request.Name, LibraryManager, dtoOptions); + if (!string.IsNullOrWhiteSpace(request.UserId)) { var user = UserManager.GetUserById(request.UserId); diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs index dbce22578..21f416025 100644 --- a/MediaBrowser.Api/UserLibrary/PersonsService.cs +++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs @@ -64,10 +64,10 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>Task{BaseItemDto}.</returns> private BaseItemDto GetItem(GetPerson request) { - var item = GetPerson(request.Name, LibraryManager); - var dtoOptions = GetDtoOptions(AuthorizationContext, request); + var item = GetPerson(request.Name, LibraryManager, dtoOptions); + if (!string.IsNullOrWhiteSpace(request.UserId)) { var user = UserManager.GetUserById(request.UserId); diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs index f4debcf48..7ac1264e8 100644 --- a/MediaBrowser.Api/UserLibrary/StudiosService.cs +++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs @@ -66,10 +66,10 @@ namespace MediaBrowser.Api.UserLibrary /// <returns>Task{BaseItemDto}.</returns> private BaseItemDto GetItem(GetStudio request) { - var item = GetStudio(request.Name, LibraryManager); - var dtoOptions = GetDtoOptions(AuthorizationContext, request); - + + var item = GetStudio(request.Name, LibraryManager, dtoOptions); + if (!string.IsNullOrWhiteSpace(request.UserId)) { var user = UserManager.GetUserById(request.UserId); |
