From 9e82fc09ca19f9820a0871bb2d8213289d53ee4f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 21 Mar 2014 12:55:47 -0400 Subject: update media version naming convention --- .../Library/Resolvers/Movies/MovieResolver.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers') diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs index b11457ec5..d7b2b1321 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs @@ -396,7 +396,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies private T GetMovieWithAlternateVersions(IEnumerable movies) where T : Video, new() { - var sortedMovies = movies.OrderBy(i => i.Path.Length).ToList(); + var sortedMovies = movies.OrderBy(i => i.Path).ToList(); // Cap this at five to help avoid incorrect matching if (sortedMovies.Count > 5) @@ -406,11 +406,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies var firstMovie = sortedMovies[0]; - var filenamePrefix = Path.GetFileNameWithoutExtension(firstMovie.Path); + var filenamePrefix = Path.GetFileName(Path.GetDirectoryName(firstMovie.Path)); if (!string.IsNullOrWhiteSpace(filenamePrefix)) { - if (sortedMovies.Skip(1).All(i => Path.GetFileNameWithoutExtension(i.Path).StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase))) + if (sortedMovies.All(i => Path.GetFileNameWithoutExtension(i.Path).StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase))) { firstMovie.HasLocalAlternateVersions = true; -- cgit v1.2.3