From c389dc947338a3ea1a7cd75d98c82eeb46cde29e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 4 Jun 2016 12:10:10 -0400
Subject: [PATCH] more jquery removal

---
 MediaBrowser.Controller/Entities/TV/Series.cs    | 11 +++++++++--
 .../TV/TVSeriesManager.cs                        | 16 ++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index e361fa87d5..a241483607 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -238,9 +238,16 @@ namespace MediaBrowser.Controller.Entities.TV
 
         public IEnumerable<Episode> GetEpisodes(User user, bool includeMissing, bool includeVirtualUnaired)
         {
-            var allSeriesEpisodes = GetAllEpisodes(user).ToList();
+            var allItems = LibraryManager.GetItemList(new InternalItemsQuery(user)
+            {
+                AncestorWithPresentationUniqueKey = PresentationUniqueKey,
+                IncludeItemTypes = new[] { typeof(Episode).Name, typeof(Season).Name },
+                SortBy = new[] { ItemSortBy.SortName }
+            }).ToList();
 
-            var allEpisodes = GetSeasons(user, true, true)
+            var allSeriesEpisodes = allItems.OfType<Episode>().ToList();
+
+            var allEpisodes = allItems.OfType<Season>()
                 .SelectMany(i => i.GetEpisodes(this, user, includeMissing, includeVirtualUnaired, allSeriesEpisodes))
                 .Reverse()
                 .ToList();
diff --git a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
index 6019d64b4b..d57aea08e2 100644
--- a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
+++ b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
@@ -125,7 +125,7 @@ namespace MediaBrowser.Server.Implementations.TV
         private Tuple<Episode, DateTime, bool> GetNextUp(Series series, User user)
         {
             // Get them in display order, then reverse
-            var allEpisodes = series.GetEpisodes(user, true, true)
+            var allEpisodes = series.GetEpisodes(user, false, false)
                 .Where(i => !i.ParentIndexNumber.HasValue || i.ParentIndexNumber.Value != 0)
                 .Reverse()
                 .ToList();
@@ -134,8 +134,6 @@ namespace MediaBrowser.Server.Implementations.TV
             var lastWatchedDate = DateTime.MinValue;
             Episode nextUp = null;
 
-            var includeMissing = user.Configuration.DisplayMissingEpisodes;
-
             var unplayedEpisodes = new List<Episode>();
 
             // Go back starting with the most recent episodes
@@ -157,10 +155,7 @@ namespace MediaBrowser.Server.Implementations.TV
                 {
                     unplayedEpisodes.Add(episode);
 
-                    if (!episode.IsVirtualUnaired && (includeMissing || !episode.IsMissingEpisode))
-                    {
-                        nextUp = episode;
-                    }
+                    nextUp = episode;
                 }
             }
 
@@ -175,11 +170,8 @@ namespace MediaBrowser.Server.Implementations.TV
             {
                 var unplayedEpisode = unplayedEpisodes[i];
 
-                if (!unplayedEpisode.IsVirtualUnaired && (includeMissing || !unplayedEpisode.IsMissingEpisode))
-                {
-                    firstEpisode = unplayedEpisode;
-                    break;
-                }
+                firstEpisode = unplayedEpisode;
+                break;
             }
 
             // Return the first episode