support metabrowser special episode attributes

3 files changed, 7 insertions, 8 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 9cd839b21a..a6178536c6 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1728,11 +1728,9 @@ namespace MediaBrowser.Controller.Entities
             // If we didn't the metafile entry, check the Season
             if (metaFileEntry == null)
             {
-                var episode = this as Episode;
-
-                if (episode != null && episode.Season != null)
+                if (Parent != null)
                 {
-                    episode.Season.ResolveArgs.GetMetaFileByPath(imagePath);
+                    metaFileEntry = Parent.ResolveArgs.GetMetaFileByPath(imagePath);
                 }
             }
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index f92e7e3e05..8dbc981938 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Resolvers;
@@ -1315,7 +1314,7 @@ namespace MediaBrowser.Controller.Entities
         public override async Task MarkPlayed(User user, DateTime? datePlayed, IUserDataManager userManager)
         {
             // Sweep through recursively and update status
-            var tasks = GetRecursiveChildren(user, true).Where(i => !i.IsFolder).Select(c => c.MarkPlayed(user, datePlayed, userManager));
+            var tasks = GetRecursiveChildren(user, true).Where(i => !i.IsFolder && i.LocationType != LocationType.Virtual).Select(c => c.MarkPlayed(user, datePlayed, userManager));
 
             await Task.WhenAll(tasks).ConfigureAwait(false);
         }
@@ -1329,7 +1328,7 @@ namespace MediaBrowser.Controller.Entities
         public override async Task MarkUnplayed(User user, IUserDataManager userManager)
         {
             // Sweep through recursively and update status
-            var tasks = GetRecursiveChildren(user, true).Where(i => !i.IsFolder).Select(c => c.MarkUnplayed(user, userManager));
+            var tasks = GetRecursiveChildren(user, true).Where(i => !i.IsFolder && i.LocationType != LocationType.Virtual).Select(c => c.MarkUnplayed(user, userManager));
 
             await Task.WhenAll(tasks).ConfigureAwait(false);
         }
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 5100916ffa..c68ba0ad1f 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -36,7 +36,9 @@ namespace MediaBrowser.Controller.Entities.TV
         /// Gets the season in which it aired.
         /// </summary>
         /// <value>The aired season.</value>
-        public int? SpecialSeasonNumber { get; set; }
+        public int? AirsBeforeSeasonNumber { get; set; }
+        public int? AirsAfterSeasonNumber { get; set; }
+        public int? AirsBeforeEpisodeNumber { get; set; }
 
         /// <summary>
         /// We want to group into series not show individually in an index