From 6b136b97ecedfaf746154851db5178c78055debd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 1 Feb 2017 15:56:14 -0500 Subject: update ordering of search results --- Emby.Server.Implementations/Library/SearchEngine.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Emby.Server.Implementations/Library') diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs index e6c88aa1a..a47a3322e 100644 --- a/Emby.Server.Implementations/Library/SearchEngine.cs +++ b/Emby.Server.Implementations/Library/SearchEngine.cs @@ -176,7 +176,7 @@ namespace Emby.Server.Implementations.Library return new Tuple(item, index.Item1, index.Item2); })); - var returnValue = hints.Where(i => i.Item3 >= 0).OrderBy(i => i.Item3).Select(i => new SearchHintInfo + var returnValue = hints.Where(i => i.Item3 >= 0).OrderBy(i => i.Item3).ThenBy(i => i.Item1.SortName).Select(i => new SearchHintInfo { Item = i.Item1, MatchedTerm = i.Item2 -- cgit v1.2.3 From 819efd2a7db5c393bec17e497a400a29c7dcb386 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 1 Feb 2017 15:56:28 -0500 Subject: update EpisodeResolver --- Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Emby.Server.Implementations/Library') diff --git a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs index 2a4cc49b7..cf37366fb 100644 --- a/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs @@ -64,6 +64,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV episode.SeasonId = season.Id; episode.SeasonName = season.Name; } + + // Assume season 1 if there's no season folder and a season number could not be determined + if (season == null && !episode.ParentIndexNumber.HasValue && (episode.IndexNumber.HasValue || episode.PremiereDate.HasValue)) + { + episode.ParentIndexNumber = 1; + } } return episode; -- cgit v1.2.3