lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert single/multi transition. too risky for now.

Browse Source
This commit is contained in:
Luke Pulverenti 2013-08-18 11:23:28 -04:00
parent 2beb9861e4
commit c59e49a8ed
4 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Common/Extensions/BaseExtensions.cs
View File

@ -43,19 +43,6 @@ namespace MediaBrowser.Common.Extensions
/// <param name="type">The type.</param> /// <param name="type">The type.</param>
/// <returns>Guid.</returns> /// <returns>Guid.</returns>
public static Guid GetMBId(this string str, Type type) 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) if (type == null)
{ {
@ -64,11 +51,6 @@ namespace MediaBrowser.Common.Extensions
var key = type.FullName + str.ToLower(); var key = type.FullName + str.ToLower();
if (isInMixedFolder)
{
key += "InMixedFolder";
}
return key.GetMD5(); return key.GetMD5();
} }

2
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -101,7 +101,7 @@ namespace MediaBrowser.Controller.Entities
if (item.Id == Guid.Empty) 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) if (item.DateCreated == DateTime.MinValue)

5
MediaBrowser.Providers/Movies/MovieDbProvider.cs
View File

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

2
MediaBrowser.Server.Implementations/Library/ResolverHelper.cs
View File

@ -34,7 +34,7 @@ namespace MediaBrowser.Server.Implementations.Library
item.Parent = args.Parent; 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 the resolver didn't specify this
if (string.IsNullOrEmpty(item.DisplayMediaType)) if (string.IsNullOrEmpty(item.DisplayMediaType))