diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-25 01:34:50 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-25 01:34:50 -0500 |
| commit | a1a56557ece84d8b726a6c06b2620fa43ff22461 (patch) | |
| tree | a9b96eccbe5fd08c34174f5c5cff8e01ac822fea /MediaBrowser.Api/TvShowsService.cs | |
| parent | 67559378009062a26173888ad457d0c9116bfc9a (diff) | |
sync updates
Diffstat (limited to 'MediaBrowser.Api/TvShowsService.cs')
| -rw-r--r-- | MediaBrowser.Api/TvShowsService.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs index 79db6cbe5..ccb844912 100644 --- a/MediaBrowser.Api/TvShowsService.cs +++ b/MediaBrowser.Api/TvShowsService.cs @@ -256,10 +256,10 @@ namespace MediaBrowser.Api { var user = _userManager.GetUserById(request.UserId); - var items = GetAllLibraryItems(request.UserId, _userManager, _libraryManager, request.ParentId) - .OfType<Episode>(); + var items = GetAllLibraryItems(request.UserId, _userManager, _libraryManager, request.ParentId, i => i is Episode); - var itemsList = _libraryManager.Sort(items, user, new[] { "PremiereDate", "AirTime", "SortName" }, SortOrder.Ascending) + var itemsList = _libraryManager + .Sort(items, user, new[] { "PremiereDate", "AirTime", "SortName" }, SortOrder.Ascending) .Cast<Episode>() .ToList(); @@ -450,24 +450,25 @@ namespace MediaBrowser.Api episodes = episodes.Where(i => i.IsVirtualUnaired == val); } + IEnumerable<BaseItem> returnItems = episodes; + // This must be the last filter if (!string.IsNullOrEmpty(request.AdjacentTo)) { - episodes = UserViewBuilder.FilterForAdjacency(episodes, request.AdjacentTo) - .Cast<Episode>(); + returnItems = UserViewBuilder.FilterForAdjacency(returnItems, request.AdjacentTo); } - episodes = _libraryManager.ReplaceVideosWithPrimaryVersions(episodes).Cast<Episode>(); + returnItems = _libraryManager.ReplaceVideosWithPrimaryVersions(returnItems); var dtoOptions = GetDtoOptions(request); - var returnItems = _dtoService.GetBaseItemDtos(episodes, dtoOptions, user) + var dtos = _dtoService.GetBaseItemDtos(returnItems, dtoOptions, user) .ToArray(); return new ItemsResult { - TotalRecordCount = returnItems.Length, - Items = returnItems + TotalRecordCount = dtos.Length, + Items = dtos }; } } |
