revert single/multi transition. too risky for now.

MediaBrowser.Common/Extensions/BaseExtensions.cs

@@ -43,19 +43,6 @@ namespace MediaBrowser.Common.Extensions
         /// <param name="type">The type.</param>
         /// <returns>Guid.</returns>
         public static Guid GetMBId(this string str, Type type)
-        {
-            return str.GetMBId(type, false);
-        }
-
-        /// <summary>
-        /// Gets the MB id.
-        /// </summary>
-        /// <param name="str">The STR.</param>
-        /// <param name="type">The type.</param>
-        /// <param name="isInMixedFolder">if set to <c>true</c> [is in mixed folder].</param>
-        /// <returns>Guid.</returns>
-        /// <exception cref="System.ArgumentNullException">type</exception>
-        public static Guid GetMBId(this string str, Type type, bool isInMixedFolder)
         {
             if (type == null)
             {
@@ -64,11 +51,6 @@ namespace MediaBrowser.Common.Extensions
 
             var key = type.FullName + str.ToLower();
 
-            if (isInMixedFolder)
-            {
-                key += "InMixedFolder";
-            }
-
             return key.GetMD5();
         }
 

MediaBrowser.Controller/Entities/Folder.cs

@@ -101,7 +101,7 @@ namespace MediaBrowser.Controller.Entities
 
             if (item.Id == Guid.Empty)
             {
-                item.Id = item.Path.GetMBId(item.GetType(), item.IsInMixedFolder);
+                item.Id = item.Path.GetMBId(item.GetType());
             }
 
             if (item.DateCreated == DateTime.MinValue)

MediaBrowser.Providers/Movies/MovieDbProvider.cs

@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
@@ -377,7 +376,7 @@ namespace MediaBrowser.Providers.Movies
         /// <param name="language">The language.</param>
         /// <param name="cancellationToken">The cancellation token</param>
         /// <returns>Task{System.String}.</returns>
-        public virtual async Task<string> AttemptFindId(string name, int? year, string language, CancellationToken cancellationToken)
+        private async Task<string> AttemptFindId(string name, int? year, string language, CancellationToken cancellationToken)
         {
             string url3 = string.Format(Search3, UrlEncode(name), ApiKey, language);
             TmdbMovieSearchResults searchResult = null;

MediaBrowser.Server.Implementations/Library/ResolverHelper.cs

@@ -34,7 +34,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 item.Parent = args.Parent;
             }
 
-            item.Id = item.Path.GetMBId(item.GetType(), item.IsInMixedFolder);
+            item.Id = item.Path.GetMBId(item.GetType());
 
             // If the resolver didn't specify this
             if (string.IsNullOrEmpty(item.DisplayMediaType))