From 6b28eee2dbfbaa4b578f2f1ff3aca7182cc6aedf Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Aug 2017 22:09:07 -0400
Subject: rework episode queries

---
 MediaBrowser.Controller/Entities/TV/Episode.cs |  9 +-------
 MediaBrowser.Controller/Entities/TV/Series.cs  | 30 +++-----------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

(limited to 'MediaBrowser.Controller/Entities/TV')

diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 3cdfd19f10..c30e0ef8e7 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -282,16 +282,10 @@ namespace MediaBrowser.Controller.Entities.TV
         {
             get
             {
-                return LocationType == LocationType.Virtual && !IsUnaired;
+                return LocationType == LocationType.Virtual;
             }
         }
 
-        [IgnoreDataMember]
-        public bool IsVirtualUnaired
-        {
-            get { return LocationType == LocationType.Virtual && IsUnaired; }
-        }
-
         [IgnoreDataMember]
         public Guid? SeasonId { get; set; }
         [IgnoreDataMember]
@@ -346,7 +340,6 @@ namespace MediaBrowser.Controller.Entities.TV
 
             id.IsMissingEpisode = IsMissingEpisode;
             id.IndexNumberEnd = IndexNumberEnd;
-            id.IsVirtualUnaired = IsVirtualUnaired;
 
             return id;
         }
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 7d1c7314d0..854c1d4da2 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -250,18 +250,10 @@ namespace MediaBrowser.Controller.Entities.TV
             query.IncludeItemTypes = new[] { typeof(Season).Name };
             query.SortBy = new[] {ItemSortBy.SortName};
 
-            if (!config.DisplayMissingEpisodes && !config.DisplayUnairedEpisodes)
-            {
-                query.IsVirtualItem = false;
-            }
-            else if (!config.DisplayMissingEpisodes)
+            if (!config.DisplayMissingEpisodes)
             {
                 query.IsMissing = false;
             }
-            else if (!config.DisplayUnairedEpisodes)
-            {
-                query.IsVirtualUnaired = false;
-            }
         }
 
         protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query)
@@ -309,18 +301,10 @@ namespace MediaBrowser.Controller.Entities.TV
                 DtoOptions = options
             };
             var config = user.Configuration;
-            if (!config.DisplayMissingEpisodes && !config.DisplayUnairedEpisodes)
-            {
-                query.IsVirtualItem = false;
-            }
-            else if (!config.DisplayMissingEpisodes)
+            if (!config.DisplayMissingEpisodes)
             {
                 query.IsMissing = false;
             }
-            else if (!config.DisplayUnairedEpisodes)
-            {
-                query.IsVirtualUnaired = false;
-            }
 
             var allItems = LibraryManager.GetItemList(query);
 
@@ -428,18 +412,10 @@ namespace MediaBrowser.Controller.Entities.TV
             if (user != null)
             {
                 var config = user.Configuration;
-                if (!config.DisplayMissingEpisodes && !config.DisplayUnairedEpisodes)
-                {
-                    query.IsVirtualItem = false;
-                }
-                else if (!config.DisplayMissingEpisodes)
+                if (!config.DisplayMissingEpisodes)
                 {
                     query.IsMissing = false;
                 }
-                else if (!config.DisplayUnairedEpisodes)
-                {
-                    query.IsVirtualUnaired = false;
-                }
             }
 
             var allItems = LibraryManager.GetItemList(query).OfType<Episode>();
-- 
cgit v1.2.3