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

Merge pull request #933 from cvium/fix_movie_matching_again

Browse Source 
Semi-revert to prefer old movie grouping behaviour
This commit is contained in:
Bond-009 2019-02-18 16:48:05 -05:00 committed by GitHub
commit 77d4fec6eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Emby.Naming/Video/VideoListResolver.cs
View File

@ -175,6 +175,54 @@ namespace Emby.Naming.Video
return videos;
}
var folderName = Path.GetFileName(Path.GetDirectoryName(videos[0].Files[0].Path));
if (!string.IsNullOrEmpty(folderName))
{
var videosMatchingFolder = new List<VideoInfo>();
foreach (VideoInfo video in videos)
{
// Only interested in single files
if (video.Files.Count != 1)
{
continue;
}
if (string.Equals(folderName, video.Name, StringComparison.OrdinalIgnoreCase))
{
videosMatchingFolder.Add(video);
}
// Eg. My Movie == My Movie - Some Other Info, TODO doesn't seem like a robust test
else if (video.Name.StartsWith(folderName, StringComparison.OrdinalIgnoreCase) &&
video.Name.Substring(folderName.Length).TrimStart().StartsWith("-"))
{
videosMatchingFolder.Add(video);
}
}
// It is assumed that any non-matching files are random samples, trailers, extras etc.
// So if there's at least one video file matching the folder name, skip the rest.
if (videosMatchingFolder.Count > 0)
{
var primary = videosMatchingFolder[0];
var remainingVideos = videosMatchingFolder.Skip(1);
var videoInfo = new VideoInfo
{
Name = folderName,
Year = primary.Year,
Files = primary.Files,
AlternateVersions = new List<VideoFileInfo>(),
Extras = primary.Extras
};
foreach (VideoInfo video in remainingVideos)
{
videoInfo.AlternateVersions.Add(video.Files.First());
videoInfo.Extras.AddRange(video.Extras);
}
return new[] { videoInfo };
}
}
return videos.GroupBy(v => new { v.Name, v.Year }).Select(group => new VideoInfo
{
// Because of the grouping, we can grab the information from the first movie and make it primary