diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs index 0b63d7b31c..6d95cfa576 100644 --- a/MediaBrowser.Common/Extensions/BaseExtensions.cs +++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs @@ -43,19 +43,6 @@ namespace MediaBrowser.Common.Extensions /// The type. /// Guid. public static Guid GetMBId(this string str, Type type) - { - return str.GetMBId(type, false); - } - - /// - /// Gets the MB id. - /// - /// The STR. - /// The type. - /// if set to true [is in mixed folder]. - /// Guid. - /// type - 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(); } diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index a27f1fdd08..3eda96d3d2 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/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) diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index 07ba5ccbcf..25653ef599 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/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 /// The language. /// The cancellation token /// Task{System.String}. - public virtual async Task AttemptFindId(string name, int? year, string language, CancellationToken cancellationToken) + private async Task AttemptFindId(string name, int? year, string language, CancellationToken cancellationToken) { string url3 = string.Format(Search3, UrlEncode(name), ApiKey, language); TmdbMovieSearchResults searchResult = null; diff --git a/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs b/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs index 1605db5a7b..8b98a69447 100644 --- a/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs +++ b/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))