Merge pull request #1 from MediaBrowser/master

Update to latest

1 files changed, 55 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index 42178c44c..7c68448e5 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.IO;
+using System.Globalization;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using System;
@@ -15,6 +16,21 @@ namespace MediaBrowser.Controller.Resolvers
     public static class EntityResolutionHelper
     {
         /// <summary>
+        /// Any folder named in this list will be ignored - can be added to at runtime for extensibility
+        /// </summary>
+        public static readonly List<string> IgnoreFolders = new List<string>
+        {
+                "metadata",
+                "ps3_update",
+                "ps3_vprm",
+                "extrafanart",
+                "extrathumbs",
+                ".actors",
+                ".wd_tv"
+
+        };
+
+        /// <summary>
         /// Any extension in this list is considered a video file - can be added to at runtime for extensibility
         /// </summary>
         public static List<string> VideoFileExtensions = new List<string>
@@ -174,6 +190,44 @@ namespace MediaBrowser.Controller.Resolvers
         }
 
         /// <summary>
+        /// Determines whether [is multi disc album folder] [the specified path].
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns><c>true</c> if [is multi disc album folder] [the specified path]; otherwise, <c>false</c>.</returns>
+        public static bool IsMultiDiscAlbumFolder(string path)
+        {
+            var filename = Path.GetFileName(path);
+
+            if (string.IsNullOrWhiteSpace(filename))
+            {
+                return false;
+            }
+
+            // Normalize
+            // Remove whitespace
+            filename = filename.Replace("-", string.Empty);
+            filename = Regex.Replace(filename, @"\s+", "");
+
+            var prefixes = new[] { "disc", "cd", "disk" };
+
+            foreach (var prefix in prefixes)
+            {
+                if (filename.IndexOf(prefix, StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    var tmp = filename.Substring(prefix.Length);
+
+                    int val;
+                    if (int.TryParse(tmp, NumberStyles.Any, CultureInfo.InvariantCulture, out val))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
         /// Ensures DateCreated and DateModified have values
         /// </summary>
         /// <param name="fileSystem">The file system.</param>