diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 15 insertions, 15 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index 748bc4b9c..b3984bb6c 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -87,18 +87,30 @@ namespace MediaBrowser.Server.Implementations.Channels .ToList(); } + var all = channels; + var totalCount = all.Count; + + if (query.StartIndex.HasValue) + { + all = all.Skip(query.StartIndex.Value).ToList(); + } + if (query.Limit.HasValue) + { + all = all.Take(query.Limit.Value).ToList(); + } + // Get everything var fields = Enum.GetNames(typeof(ItemFields)) .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)) .ToList(); - var returnItems = channels.Select(i => _dtoService.GetBaseItemDto(i, fields, user)) + var returnItems = all.Select(i => _dtoService.GetBaseItemDto(i, fields, user)) .ToArray(); var result = new QueryResult<BaseItemDto> { Items = returnItems, - TotalRecordCount = returnItems.Length + TotalRecordCount = totalCount }; return Task.FromResult(result); diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index d98400527..b9a89e297 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1348,8 +1348,6 @@ namespace MediaBrowser.Server.Implementations.Library UpdateItemInLibraryCache(item); } - UpdateCollectionFolders(); - if (ItemAdded != null) { foreach (var item in list) @@ -1412,8 +1410,6 @@ namespace MediaBrowser.Server.Implementations.Library /// <param name="item">The item.</param> public void ReportItemRemoved(BaseItem item) { - UpdateCollectionFolders(); - if (ItemRemoved != null) { try @@ -1427,14 +1423,6 @@ namespace MediaBrowser.Server.Implementations.Library } } - private void UpdateCollectionFolders() - { - foreach (var folder in _userManager.Users.SelectMany(i => i.RootFolder.Children).OfType<CollectionFolder>().ToList()) - { - folder.ResetDynamicChildren(); - } - } - /// <summary> /// Retrieves the item. /// </summary> diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 9ff395b7e..cb5074deb 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -348,7 +348,7 @@ "OptionDownloadPrimaryImage": "Primary", "HeaderFetchImages": "Fetch Images:", "HeaderImageSettings": "Image Settings", - "TabCustomizations": "Customizations", + "TabOther": "Other", "LabelMaxBackdropsPerItem": "Maximum number of backdrops per item:", "LabelMaxScreenshotsPerItem": "Maximum number of screenshots per item:", "LabelMinBackdropDownloadWidth": "Minimum backdrop download width:", |