From 11c37780531791a898afd36bc186b4b60d1dce9b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 15 Aug 2013 15:09:52 -0400
Subject: completed multiple movie in folder support

---
 MediaBrowser.Controller/Entities/BaseItem.cs |  2 ++
 MediaBrowser.Controller/Entities/Game.cs     | 18 +-----------------
 MediaBrowser.Controller/Entities/Video.cs    |  2 --
 3 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 87aa471ea8..cc2e82b1f0 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -55,6 +55,8 @@ namespace MediaBrowser.Controller.Entities
         public const string ThemeVideosFolderName = "backdrops";
         public const string XbmcTrailerFileSuffix = "-trailer";
 
+        public bool IsInMixedFolder { get; set; }
+        
         private string _name;
         /// <summary>
         /// Gets or sets the name.
diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
index 63a04e5207..9a787b3d38 100644
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ b/MediaBrowser.Controller/Entities/Game.cs
@@ -24,11 +24,6 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The game system.</value>
         public string GameSystem { get; set; }
 
-        /// <summary>
-        /// Returns true if the game is combined with other games in the same folder
-        /// </summary>
-        public bool IsInMixedFolder { get; set; }
-
         /// <summary>
         /// 
         /// </summary>
@@ -36,18 +31,7 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                var directoryName = System.IO.Path.GetDirectoryName(Path);
-
-                if (IsInMixedFolder)
-                {
-                    // It's a file
-                    var baseMetaPath = System.IO.Path.Combine(directoryName, "metadata");
-                    var fileName = System.IO.Path.GetFileNameWithoutExtension(Path);
-
-                    return fileName != null ? System.IO.Path.Combine(baseMetaPath, fileName) : null;
-                }
-
-                return directoryName;
+                return System.IO.Path.GetDirectoryName(Path);
             }
         }
 
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 8bc519a437..e8896db6fe 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -65,8 +65,6 @@ namespace MediaBrowser.Controller.Entities
             return GetPlayableStreamFiles(Path);
         }
 
-        public bool IsInMixedFolder { get; set; }
-
         /// <summary>
         /// Should be overridden to return the proper folder where metadata lives
         /// </summary>
-- 
cgit v1.2.3