michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

cleanup repeated querying within CollectionFolder

Browse Source
This commit is contained in:
Luke Pulverenti 2013-09-19 11:12:54 -04:00
parent cb839f9f25
commit d580abcd65
2 changed files with 62 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -69,37 +68,41 @@ namespace MediaBrowser.Controller.Entities
return NullTaskResult;
}
private List<LinkedChild> _linkedChildren;
/// <summary>
/// Our children are actually just references to the ones in the physical root...
/// </summary>
/// <value>The linked children.</value>
public override List<LinkedChild> LinkedChildren
{
get
{
Dictionary<string, string> locationsDicionary;
try
{
locationsDicionary = ResolveArgs.PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
}
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new List<LinkedChild>();
}
return LibraryManager.RootFolder.Children
.OfType<Folder>()
.Where(i => i.Path != null && locationsDicionary.ContainsKey(i.Path))
.SelectMany(c => c.LinkedChildren).ToList();
}
get { return _linkedChildren ?? (_linkedChildren = GetLinkedChildrenInternal()); }
set
{
base.LinkedChildren = value;
}
}
private List<LinkedChild> GetLinkedChildrenInternal()
{
Dictionary<string, string> locationsDicionary;
try
{
locationsDicionary = ResolveArgs.PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
}
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new List<LinkedChild>();
}
return LibraryManager.RootFolder.Children
.OfType<Folder>()
.Where(i => i.Path != null && locationsDicionary.ContainsKey(i.Path))
.SelectMany(c => c.LinkedChildren).ToList();
}
private IEnumerable<BaseItem> _actualChildren;
/// <summary>
/// Our children are actually just references to the ones in the physical root...
@ -107,26 +110,34 @@ namespace MediaBrowser.Controller.Entities
/// <value>The actual children.</value>
protected override IEnumerable<BaseItem> ActualChildren
{
get
get { return _actualChildren ?? (_actualChildren = GetActualChildren()); }
}
private IEnumerable<BaseItem> GetActualChildren()
{
Dictionary<string, string> locationsDicionary;
try
{
Dictionary<string, string> locationsDicionary;
try
{
locationsDicionary = ResolveArgs.PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
}
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new BaseItem[] { };
}
return
LibraryManager.RootFolder.Children
.OfType<Folder>()
.Where(i => i.Path != null && locationsDicionary.ContainsKey(i.Path))
.SelectMany(c => c.Children);
locationsDicionary = ResolveArgs.PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
}
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new BaseItem[] { };
}
return
LibraryManager.RootFolder.Children
.OfType<Folder>()
.Where(i => i.Path != null && locationsDicionary.ContainsKey(i.Path))
.SelectMany(c => c.Children);
}
public void ResetDynamicChildren()
{
_actualChildren = null;
_linkedChildren = null;
}
}
}

12
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -1283,6 +1283,8 @@ namespace MediaBrowser.Server.Implementations.Library
UpdateItemInLibraryCache(item);
}
UpdateCollectionFolders();
if (ItemAdded != null)
{
foreach (var item in list)
@ -1336,6 +1338,8 @@ namespace MediaBrowser.Server.Implementations.Library
/// <param name="item">The item.</param>
public void ReportItemRemoved(BaseItem item)
{
UpdateCollectionFolders();
if (ItemRemoved != null)
{
try
@ -1349,6 +1353,14 @@ 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>