alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix failing scan

Browse Source
This commit is contained in:
Luke Pulverenti
2015-01-26 17:47:16 -05:00
parent 63f3cf97da
commit f5919990c9
20 changed files with 140 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -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);

6
MediaBrowser.Server.Implementations/Session/SessionManager.cs
View File

@@ -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);

2
MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
View File

@@ -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)