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

1 files changed, 19 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index e900dd77e..9b02571b0 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Video
     /// </summary>
-    public class Video : BaseItem, IHasMediaStreams
+    public class Video : BaseItem, IHasMediaStreams, IHasAspectRatio
     {
         public bool IsMultiPart { get; set; }
 
@@ -66,6 +66,12 @@ namespace MediaBrowser.Controller.Entities
         }
 
         /// <summary>
+        /// Gets or sets the aspect ratio.
+        /// </summary>
+        /// <value>The aspect ratio.</value>
+        public string AspectRatio { get; set; }
+        
+        /// <summary>
         /// Should be overridden to return the proper folder where metadata lives
         /// </summary>
         /// <value>The meta location.</value>
@@ -252,5 +258,17 @@ namespace MediaBrowser.Controller.Entities
             }).ToList();
         }
 
+        public override IEnumerable<string> GetDeletePaths()
+        {
+            if (!IsInMixedFolder)
+            {
+                if (VideoType == VideoType.VideoFile || VideoType == VideoType.Iso)
+                {
+                    return new[] { System.IO.Path.GetDirectoryName(Path) };
+                }
+            }
+
+            return base.GetDeletePaths();
+        }
     }
 }