From f5919990c9ef80bff28ec8a590acb2f72a806678 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 26 Jan 2015 17:47:16 -0500 Subject: fix failing scan --- MediaBrowser.Server.Implementations/Dto/DtoService.cs | 12 ++++++++---- .../Session/SessionManager.cs | 6 ++++-- MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 5640f27457..06b5138f1c 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -95,9 +95,11 @@ namespace MediaBrowser.Server.Implementations.Dto if (byName != null && !(item is LiveTvChannel)) { + var itemFilter = byName.GetItemFilter(); + var libraryItems = user != null ? - user.RootFolder.GetRecursiveChildren(user, byName.ItemFilter) : - _libraryManager.RootFolder.GetRecursiveChildren(byName.ItemFilter); + user.RootFolder.GetRecursiveChildren(user, itemFilter) : + _libraryManager.RootFolder.GetRecursiveChildren(itemFilter); SetItemByNameInfo(item, dto, libraryItems.ToList(), user); } @@ -118,9 +120,11 @@ namespace MediaBrowser.Server.Implementations.Dto if (byName != null && !(item is LiveTvChannel)) { + var itemFilter = byName.GetItemFilter(); + var libraryItems = user != null ? - user.RootFolder.GetRecursiveChildren(user, byName.ItemFilter) : - _libraryManager.RootFolder.GetRecursiveChildren(byName.ItemFilter); + user.RootFolder.GetRecursiveChildren(user, itemFilter) : + _libraryManager.RootFolder.GetRecursiveChildren(itemFilter); SetItemByNameInfo(item, dto, libraryItems.ToList(), user); diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs index 0613cda30a..f1616b85e8 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs @@ -899,9 +899,11 @@ namespace MediaBrowser.Server.Implementations.Session if (byName != null) { + var itemFilter = byName.GetItemFilter(); + var items = user == null ? - _libraryManager.RootFolder.GetRecursiveChildren(i => !i.IsFolder && byName.ItemFilter(i)) : - user.RootFolder.GetRecursiveChildren(user, i => !i.IsFolder && byName.ItemFilter(i)); + _libraryManager.RootFolder.GetRecursiveChildren(i => !i.IsFolder && itemFilter(i)) : + user.RootFolder.GetRecursiveChildren(user, i => !i.IsFolder && itemFilter(i)); items = items.OrderBy(i => i.SortName); diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs index fd4474b80e..8cad50b913 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs @@ -289,7 +289,7 @@ namespace MediaBrowser.Server.Implementations.Sync if (itemByName != null) { return user.RootFolder - .GetRecursiveChildren(user, itemByName.ItemFilter); + .GetRecursiveChildren(user, itemByName.GetItemFilter()); } if (item.IsFolder) -- cgit v1.2.3