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 --- .../UserLibrary/BaseItemsByNameService.cs | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs') diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs index 4b4d08b09..587416d83 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs @@ -53,7 +53,7 @@ namespace MediaBrowser.Api.UserLibrary /// /// The request. /// Task{ItemsResult}. - protected async Task GetResult(GetItemsByName request) + protected ItemsResult GetResult(GetItemsByName request) { User user = null; BaseItem item; @@ -80,7 +80,7 @@ namespace MediaBrowser.Api.UserLibrary } else { - items = request.Recursive ? folder.RecursiveChildren : folder.Children; + items = request.Recursive ? folder.GetRecursiveChildren() : folder.Children; } } else @@ -258,23 +258,6 @@ namespace MediaBrowser.Api.UserLibrary return dto; } - - /// - /// Gets the items. - /// - /// The user id. - /// IEnumerable{BaseItem}. - protected IEnumerable GetItems(Guid? userId) - { - if (userId.HasValue) - { - var user = UserManager.GetUserById(userId.Value); - - return UserManager.GetUserById(userId.Value).RootFolder.GetRecursiveChildren(user); - } - - return LibraryManager.RootFolder.RecursiveChildren; - } } /// -- cgit v1.2.3