From c643dd072e117aec2397e695c650e8a58be2fc6c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 27 Sep 2013 08:24:28 -0400 Subject: added more direct querying to folder --- MediaBrowser.Api/SearchService.cs | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'MediaBrowser.Api/SearchService.cs') diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs index ba669002eb..f87434e976 100644 --- a/MediaBrowser.Api/SearchService.cs +++ b/MediaBrowser.Api/SearchService.cs @@ -103,18 +103,7 @@ namespace MediaBrowser.Api /// Task{IEnumerable{SearchHintResult}}. private async Task GetSearchHintsAsync(GetSearchHints request) { - IEnumerable inputItems; - - if (request.UserId.HasValue) - { - var user = _userManager.GetUserById(request.UserId.Value); - - inputItems = user.RootFolder.GetRecursiveChildren(user); - } - else - { - inputItems = _libraryManager.RootFolder.RecursiveChildren; - } + var inputItems = GetAllLibraryItems(request.UserId, _userManager, _libraryManager); var results = await _searchEngine.GetSearchHints(inputItems, request.SearchTerm).ConfigureAwait(false); @@ -180,21 +169,21 @@ namespace MediaBrowser.Api { result.Series = season.Series.Name; - result.EpisodeCount = season.RecursiveChildren.OfType().Count(); + result.EpisodeCount = season.GetRecursiveChildren(i => i is Episode).Count; } var series = item as Series; if (series != null) { - result.EpisodeCount = series.RecursiveChildren.OfType().Count(); + result.EpisodeCount = series.GetRecursiveChildren(i => i is Episode).Count; } var album = item as MusicAlbum; if (album != null) { - var songs = album.RecursiveChildren.OfType