diff options
4 files changed, 4 insertions, 23 deletions
diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs index 0b63d7b31..6d95cfa57 100644 --- a/MediaBrowser.Common/Extensions/BaseExtensions.cs +++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs @@ -44,19 +44,6 @@ namespace MediaBrowser.Common.Extensions /// <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) { throw new ArgumentNullException("type"); @@ -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 a27f1fdd0..3eda96d3d 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 07ba5ccbc..25653ef59 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 /// <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; diff --git a/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs b/MediaBrowser.Server.Implementations/Library/ResolverHelper.cs index 1605db5a7..8b98a6944 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)) |