浏览代码

Revert "Don't return first episodes in next up"

crobibero 4 年之前
父节点
当前提交
3d754fa5bf
共有 1 个文件被更改,包括 19 次插入1 次删除
  1. 19 1
      Emby.Server.Implementations/TV/TVSeriesManager.cs

+ 19 - 1
Emby.Server.Implementations/TV/TVSeriesManager.cs

@@ -143,10 +143,28 @@ namespace Emby.Server.Implementations.TV
             var allNextUp = seriesKeys
                 .Select(i => GetNextUp(i, currentUser, dtoOptions));
 
+            // allNextUp = allNextUp.OrderByDescending(i => i.Item1);
+
+            // If viewing all next up for all series, remove first episodes
+            // But if that returns empty, keep those first episodes (avoid completely empty view)
+            var alwaysEnableFirstEpisode = !string.IsNullOrEmpty(request.SeriesId);
+            var anyFound = false;
+
             return allNextUp
                 .Where(i =>
                 {
-                    return i.Item1 != DateTime.MinValue;
+                    if (alwaysEnableFirstEpisode || i.Item1 != DateTime.MinValue)
+                    {
+                        anyFound = true;
+                        return true;
+                    }
+
+                    if (!anyFound && i.Item1 == DateTime.MinValue)
+                    {
+                        return true;
+                    }
+
+                    return false;
                 })
                 .Select(i => i.Item2())
                 .Where(i => i != null);