rework channel checking

This commit is contained in:
Luke Pulverenti
2014-05-14 14:04:26 -04:00
parent be18983f91
commit a46cbfa02b
6 changed files with 16 additions and 43 deletions

View File

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

View File

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

View File

@@ -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:",