michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

remove custom ordering of moviedb search results

Browse Source
This commit is contained in:
Luke Pulverenti 2017-03-31 15:04:27 -04:00
parent 46646b95fd
commit ba22934570
1 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
MediaBrowser.Providers/Movies/MovieDbSearch.cs
View File

@ -160,12 +160,7 @@ namespace MediaBrowser.Providers.Movies
var results = searchResults.results ?? new List<TmdbMovieSearchResult>(); var results = searchResults.results ?? new List<TmdbMovieSearchResult>();
var index = 0; return results
var resultTuples = results.Select(result => new Tuple<TmdbMovieSearchResult, int>(result, index++)).ToList();
return resultTuples.OrderBy(i => GetSearchResultOrder(i.Item1, year))
.ThenBy(i => i.Item2)
.Select(i => i.Item1)
.Select(i => .Select(i =>
{ {
var remoteResult = new RemoteSearchResult var remoteResult = new RemoteSearchResult
@ -217,12 +212,7 @@ namespace MediaBrowser.Providers.Movies
var results = searchResults.results ?? new List<TvResult>(); var results = searchResults.results ?? new List<TvResult>();
var index = 0; return results
var resultTuples = results.Select(result => new Tuple<TvResult, int>(result, index++)).ToList();
return resultTuples.OrderBy(i => GetSearchResultOrder(i.Item1, year))
.ThenBy(i => i.Item2)
.Select(i => i.Item1)
.Select(i => .Select(i =>
{ {
var remoteResult = new RemoteSearchResult var remoteResult = new RemoteSearchResult
@ -253,40 +243,6 @@ namespace MediaBrowser.Providers.Movies
} }
} }
private int GetSearchResultOrder(TmdbMovieSearchResult result, int? year)
{
if (year.HasValue)
{
DateTime r;
// These dates are always in this exact format
if (DateTime.TryParseExact(result.release_date, "yyyy-MM-dd", EnUs, DateTimeStyles.None, out r))
{
// Allow one year tolernace, preserve order from Tmdb
return Math.Abs(r.Year - year.Value);
}
}
return int.MaxValue;
}
private int GetSearchResultOrder(TvResult result, int? year)
{
if (year.HasValue)
{
DateTime r;
// These dates are always in this exact format
if (DateTime.TryParseExact(result.first_air_date, "yyyy-MM-dd", EnUs, DateTimeStyles.None, out r))
{
// Allow one year tolernace, preserve order from Tmdb
return Math.Abs(r.Year - year.Value);
}
}
return int.MaxValue;
}
/// <summary> /// <summary>
/// Class TmdbMovieSearchResult /// Class TmdbMovieSearchResult
/// </summary> /// </summary>