diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-26 00:44:24 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-26 00:44:24 -0400 |
| commit | 70fb64cc05c4fe51e661608c654a4cd1949cba35 (patch) | |
| tree | e35def65b7c0860cad14a7a2014e1487e7c41cdd /MediaBrowser.Server.Implementations/Dto | |
| parent | 9f191a3598f8d1cc6764169943186987be33a707 (diff) | |
subtitle parsing fixes
Diffstat (limited to 'MediaBrowser.Server.Implementations/Dto')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Dto/DtoService.cs | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index b28f26946c..756ff69178 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -97,13 +97,16 @@ namespace MediaBrowser.Server.Implementations.Dto if (byName != null && !(item is LiveTvChannel)) { - var itemFilter = byName.GetItemFilter(); + //if (options.Fields.Contains(ItemFields.ItemCounts)) + { + var itemFilter = byName.GetItemFilter(); - var libraryItems = user != null ? - user.RootFolder.GetRecursiveChildren(user, itemFilter) : - _libraryManager.RootFolder.GetRecursiveChildren(itemFilter); + var libraryItems = user != null ? + user.RootFolder.GetRecursiveChildren(user, itemFilter) : + _libraryManager.RootFolder.GetRecursiveChildren(itemFilter); - SetItemByNameInfo(item, dto, libraryItems.ToList(), user); + SetItemByNameInfo(item, dto, libraryItems.ToList(), user); + } } FillSyncInfo(dto, item, itemIdsWithSyncJobs, options, user); @@ -122,13 +125,16 @@ namespace MediaBrowser.Server.Implementations.Dto if (byName != null && !(item is LiveTvChannel)) { - var itemFilter = byName.GetItemFilter(); + //if (options.Fields.Contains(ItemFields.ItemCounts)) + { + var itemFilter = byName.GetItemFilter(); - var libraryItems = user != null ? - user.RootFolder.GetRecursiveChildren(user, itemFilter) : - _libraryManager.RootFolder.GetRecursiveChildren(itemFilter); + var libraryItems = user != null ? + user.RootFolder.GetRecursiveChildren(user, itemFilter) : + _libraryManager.RootFolder.GetRecursiveChildren(itemFilter); - SetItemByNameInfo(item, dto, libraryItems.ToList(), user); + SetItemByNameInfo(item, dto, libraryItems.ToList(), user); + } FillSyncInfo(dto, item, options, user); return dto; @@ -311,7 +317,11 @@ namespace MediaBrowser.Server.Implementations.Dto { var dto = GetBaseItemDtoInternal(item, options, user); - SetItemByNameInfo(item, dto, taggedItems, user); + //if (options.Fields.Contains(ItemFields.ItemCounts)) + { + SetItemByNameInfo(item, dto, taggedItems, user); + } + FillSyncInfo(dto, item, options, user); return dto; |