mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
Eliminated some list recursions
This commit is contained in:
parent
30a954300e
commit
ffbac0e3d8
2 changed files with 50 additions and 23 deletions
|
@ -69,7 +69,7 @@
|
||||||
<Reference Include="System.Runtime.Remoting" />
|
<Reference Include="System.Runtime.Remoting" />
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
<Reference Include="System.Runtime.Serialization" />
|
||||||
<Reference Include="System.Web" />
|
<Reference Include="System.Web" />
|
||||||
<Reference Include="System.Windows.Interactivity">
|
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
|
<HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Xaml" />
|
<Reference Include="System.Xaml" />
|
||||||
|
|
|
@ -65,9 +65,11 @@ namespace MediaBrowser.Controller.Entities
|
||||||
|
|
||||||
IEnumerable<BaseItem> recursiveChildren = GetParentalAllowedRecursiveChildren(user);
|
IEnumerable<BaseItem> recursiveChildren = GetParentalAllowedRecursiveChildren(user);
|
||||||
|
|
||||||
counts.RecentlyAddedItemCount = GetRecentlyAddedItems(recursiveChildren, user).Count();
|
var recentlyAddedItems = GetRecentlyAddedItems(recursiveChildren, user);
|
||||||
counts.RecentlyAddedUnPlayedItemCount = GetRecentlyAddedUnplayedItems(recursiveChildren, user).Count();
|
|
||||||
counts.InProgressItemCount = GetInProgressItems(recursiveChildren, user).Count();
|
counts.RecentlyAddedItemCount = recentlyAddedItems.Count;
|
||||||
|
counts.RecentlyAddedUnPlayedItemCount = GetRecentlyAddedUnplayedItems(recentlyAddedItems, user).Count;
|
||||||
|
counts.InProgressItemCount = GetInProgressItems(recursiveChildren, user).Count;
|
||||||
counts.PlayedPercentage = GetPlayedPercentage(recursiveChildren, user);
|
counts.PlayedPercentage = GetPlayedPercentage(recursiveChildren, user);
|
||||||
|
|
||||||
return counts;
|
return counts;
|
||||||
|
@ -151,7 +153,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets all recently added items (recursive) within a folder, based on configuration and parental settings
|
/// Gets all recently added items (recursive) within a folder, based on configuration and parental settings
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IEnumerable<BaseItem> GetRecentlyAddedItems(User user)
|
public List<BaseItem> GetRecentlyAddedItems(User user)
|
||||||
{
|
{
|
||||||
return GetRecentlyAddedItems(GetParentalAllowedRecursiveChildren(user), user);
|
return GetRecentlyAddedItems(GetParentalAllowedRecursiveChildren(user), user);
|
||||||
}
|
}
|
||||||
|
@ -159,7 +161,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets all recently added unplayed items (recursive) within a folder, based on configuration and parental settings
|
/// Gets all recently added unplayed items (recursive) within a folder, based on configuration and parental settings
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IEnumerable<BaseItem> GetRecentlyAddedUnplayedItems(User user)
|
public List<BaseItem> GetRecentlyAddedUnplayedItems(User user)
|
||||||
{
|
{
|
||||||
return GetRecentlyAddedUnplayedItems(GetParentalAllowedRecursiveChildren(user), user);
|
return GetRecentlyAddedUnplayedItems(GetParentalAllowedRecursiveChildren(user), user);
|
||||||
}
|
}
|
||||||
|
@ -167,7 +169,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets all in-progress items (recursive) within a folder
|
/// Gets all in-progress items (recursive) within a folder
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public IEnumerable<BaseItem> GetInProgressItems(User user)
|
public List<BaseItem> GetInProgressItems(User user)
|
||||||
{
|
{
|
||||||
return GetInProgressItems(GetParentalAllowedRecursiveChildren(user), user);
|
return GetInProgressItems(GetParentalAllowedRecursiveChildren(user), user);
|
||||||
}
|
}
|
||||||
|
@ -175,40 +177,65 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Takes a list of items and returns the ones that are recently added
|
/// Takes a list of items and returns the ones that are recently added
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static IEnumerable<BaseItem> GetRecentlyAddedItems(IEnumerable<BaseItem> itemSet, User user)
|
private static List<BaseItem> GetRecentlyAddedItems(IEnumerable<BaseItem> itemSet, User user)
|
||||||
{
|
{
|
||||||
return itemSet.Where(i => !(i.IsFolder) && i.IsRecentlyAdded(user));
|
var list = new List<BaseItem>();
|
||||||
|
|
||||||
|
foreach (var item in itemSet)
|
||||||
|
{
|
||||||
|
if (!item.IsFolder && item.IsRecentlyAdded(user))
|
||||||
|
{
|
||||||
|
list.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Takes a list of items and returns the ones that are recently added and unplayed
|
/// Takes a list of items and returns the ones that are recently added and unplayed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static IEnumerable<BaseItem> GetRecentlyAddedUnplayedItems(IEnumerable<BaseItem> itemSet, User user)
|
private static List<BaseItem> GetRecentlyAddedUnplayedItems(IEnumerable<BaseItem> itemSet, User user)
|
||||||
{
|
{
|
||||||
return GetRecentlyAddedItems(itemSet, user).Where(i =>
|
var list = new List<BaseItem>();
|
||||||
{
|
|
||||||
var userdata = i.GetUserData(user, false);
|
|
||||||
|
|
||||||
return userdata == null || userdata.PlayCount == 0;
|
foreach (var item in itemSet)
|
||||||
});
|
{
|
||||||
|
if (!item.IsFolder && item.IsRecentlyAdded(user))
|
||||||
|
{
|
||||||
|
var userdata = item.GetUserData(user, false);
|
||||||
|
|
||||||
|
if (userdata == null || userdata.PlayCount == 0)
|
||||||
|
{
|
||||||
|
list.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Takes a list of items and returns the ones that are in progress
|
/// Takes a list of items and returns the ones that are in progress
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static IEnumerable<BaseItem> GetInProgressItems(IEnumerable<BaseItem> itemSet, User user)
|
private static List<BaseItem> GetInProgressItems(IEnumerable<BaseItem> itemSet, User user)
|
||||||
{
|
{
|
||||||
return itemSet.Where(i =>
|
var list = new List<BaseItem>();
|
||||||
|
|
||||||
|
foreach (var item in itemSet)
|
||||||
{
|
{
|
||||||
if (i.IsFolder)
|
if (!item.IsFolder)
|
||||||
{
|
{
|
||||||
return false;
|
var userdata = item.GetUserData(user, false);
|
||||||
|
|
||||||
|
if (userdata != null && userdata.PlaybackPositionTicks > 0)
|
||||||
|
{
|
||||||
|
list.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var userdata = i.GetUserData(user, false);
|
return list;
|
||||||
|
|
||||||
return userdata != null && userdata.PlaybackPositionTicks > 0;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in a new issue