diff options
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 87 |
1 files changed, 59 insertions, 28 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 694ec1ca2..1cad13f22 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -331,13 +331,15 @@ namespace MediaBrowser.Controller.Entities /// </summary>
public ItemSpecialCounts GetSpecialCounts(User user)
{
- ItemSpecialCounts counts = new ItemSpecialCounts();
+ var counts = new ItemSpecialCounts();
IEnumerable<BaseItem> recursiveChildren = GetRecursiveChildren(user);
- counts.RecentlyAddedItemCount = GetRecentlyAddedItems(recursiveChildren, user).Count();
- counts.RecentlyAddedUnPlayedItemCount = GetRecentlyAddedUnplayedItems(recursiveChildren, user).Count();
- counts.InProgressItemCount = GetInProgressItems(recursiveChildren, user).Count();
+ var recentlyAddedItems = GetRecentlyAddedItems(recursiveChildren, user);
+
+ counts.RecentlyAddedItemCount = recentlyAddedItems.Count;
+ counts.RecentlyAddedUnPlayedItemCount = GetRecentlyAddedUnplayedItems(recentlyAddedItems, user).Count;
+ counts.InProgressItemCount = GetInProgressItems(recursiveChildren, user).Count;
counts.PlayedPercentage = GetPlayedPercentage(recursiveChildren, user);
return counts;
@@ -421,7 +423,7 @@ namespace MediaBrowser.Controller.Entities /// <summary>
/// Gets all recently added items (recursive) within a folder, based on configuration and parental settings
/// </summary>
- public IEnumerable<BaseItem> GetRecentlyAddedItems(User user)
+ public List<BaseItem> GetRecentlyAddedItems(User user)
{
return GetRecentlyAddedItems(GetRecursiveChildren(user), user);
}
@@ -429,7 +431,7 @@ namespace MediaBrowser.Controller.Entities /// <summary>
/// Gets all recently added unplayed items (recursive) within a folder, based on configuration and parental settings
/// </summary>
- public IEnumerable<BaseItem> GetRecentlyAddedUnplayedItems(User user)
+ public List<BaseItem> GetRecentlyAddedUnplayedItems(User user)
{
return GetRecentlyAddedUnplayedItems(GetRecursiveChildren(user), user);
}
@@ -437,7 +439,7 @@ namespace MediaBrowser.Controller.Entities /// <summary>
/// Gets all in-progress items (recursive) within a folder
/// </summary>
- public IEnumerable<BaseItem> GetInProgressItems(User user)
+ public List<BaseItem> GetInProgressItems(User user)
{
return GetInProgressItems(GetRecursiveChildren(user), user);
}
@@ -445,40 +447,65 @@ namespace MediaBrowser.Controller.Entities /// <summary>
/// Takes a list of items and returns the ones that are recently added
/// </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>
/// Takes a list of items and returns the ones that are recently added and unplayed
/// </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>();
+
+ foreach (var item in itemSet)
{
- var userdata = i.GetUserData(user, false);
+ if (!item.IsFolder && item.IsRecentlyAdded(user))
+ {
+ var userdata = item.GetUserData(user, false);
- return userdata == null || userdata.PlayCount == 0;
- });
+ if (userdata == null || userdata.PlayCount == 0)
+ {
+ list.Add(item);
+ }
+ }
+ }
+
+ return list;
}
/// <summary>
/// Takes a list of items and returns the ones that are in progress
/// </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);
- var userdata = i.GetUserData(user, false);
+ if (userdata != null && userdata.PlaybackPositionTicks > 0)
+ {
+ list.Add(item);
+ }
+ }
+ }
- return userdata != null && userdata.PlaybackPositionTicks > 0;
- });
+ return list;
}
/// <summary>
@@ -488,15 +515,14 @@ namespace MediaBrowser.Controller.Entities {
itemSet = itemSet.Where(i => !(i.IsFolder));
- if (!itemSet.Any())
- {
- return 0;
- }
-
decimal totalPercent = 0;
+ int count = 0;
+
foreach (BaseItem item in itemSet)
{
+ count++;
+
UserItemData data = item.GetUserData(user, false);
if (data == null)
@@ -516,7 +542,12 @@ namespace MediaBrowser.Controller.Entities }
}
- return totalPercent / itemSet.Count();
+ if (count == 0)
+ {
+ return 0;
+ }
+
+ return totalPercent / count;
}
/// <summary>
|