Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 22 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
index e8374c274..e15b7e4c9 100644
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ b/MediaBrowser.Controller/Entities/Game.cs
@@ -4,16 +4,26 @@ using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Entities
 {
-    public class Game : BaseItem, IHasSoundtracks
+    public class Game : BaseItem, IHasSoundtracks, IHasTrailers
     {
         public List<Guid> SoundtrackIds { get; set; }
-        
+
         public Game()
         {
             MultiPartGameFiles = new List<string>();
             SoundtrackIds = new List<Guid>();
+            RemoteTrailers = new List<MediaUrl>();
+            LocalTrailerIds = new List<Guid>();
         }
 
+        public List<Guid> LocalTrailerIds { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the remote trailers.
+        /// </summary>
+        /// <value>The remote trailers.</value>
+        public List<MediaUrl> RemoteTrailers { get; set; }
+        
         /// <summary>
         /// Gets the type of the media.
         /// </summary>
@@ -84,5 +94,15 @@ namespace MediaBrowser.Controller.Entities
             }
             return base.GetUserDataKey();
         }
+
+        public override IEnumerable<string> GetDeletePaths()
+        {
+            if (!IsInMixedFolder)
+            {
+                return new[] { System.IO.Path.GetDirectoryName(Path) };
+            }
+
+            return base.GetDeletePaths();
+        }
     }
 }