Backup_Repos/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr synced 2026-04-21 20:31:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix possible enumerations in TrackGroupingService

Browse source
This commit is contained in:
Bogdan 2024-01-06 18:41:07 +02:00
parent 4cbafa76d8
commit 2749479283
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/NzbDrone.Core/MediaFiles/BookImport/Identification/TrackGroupingService.cs
View file

@ -21,9 +21,9 @@ public class TrackGroupingService : ITrackGroupingService
{
private static readonly Logger _logger = NzbDroneLogger.GetLogger(typeof(TrackGroupingService));
private static readonly List<string> MultiDiscMarkers = new List<string> { @"dis[ck]", @"cd" };
private static readonly List<string> MultiDiscMarkers = new () { @"dis[ck]", @"cd" };
private static readonly string MultiDiscPatternFormat = @"^(?<root>.*%s[\W_]*)\d";
private static readonly List<string> VariousAuthorTitles = new List<string> { "", "various authors", "various", "va", "unknown" };
private static readonly List<string> VariousAuthorTitles = new () { "", "various authors", "various", "va", "unknown" };
public List<LocalEdition> GroupTracks(List<LocalBook> localTracks)
{
@ -32,15 +32,16 @@ public List<LocalEdition> GroupTracks(List<LocalBook> localTracks)
var releases = new List<LocalEdition>();
// text files are always single file releases
var textfiles = localTracks.Where(x => MediaFileExtensions.TextExtensions.Contains(Path.GetExtension(x.Path)));
foreach (var file in textfiles)
var textFiles = localTracks.Where(x => MediaFileExtensions.TextExtensions.Contains(Path.GetExtension(x.Path))).ToList();
foreach (var file in textFiles)
{
releases.Add(new LocalEdition(new List<LocalBook> { file }));
}
// first attempt, assume grouped by folder
var unprocessed = new List<LocalBook>();
foreach (var group in GroupTracksByDirectory(localTracks.Except(textfiles).ToList()))
foreach (var group in GroupTracksByDirectory(localTracks.Except(textFiles).ToList()))
{
var tracks = group.ToList();
if (LooksLikeSingleRelease(tracks))
@ -122,8 +123,8 @@ public static bool LooksLikeSingleRelease(List<LocalBook> tracks)
const double tagFuzz = 0.9;
// check that any Book/Release MBID is unique
if (tracks.Select(x => x.FileTrackInfo.BookMBId).Distinct().Where(x => x.IsNotNullOrWhiteSpace()).Count() > 1 ||
tracks.Select(x => x.FileTrackInfo.ReleaseMBId).Distinct().Where(x => x.IsNotNullOrWhiteSpace()).Count() > 1)
if (tracks.Select(x => x.FileTrackInfo.BookMBId).Distinct().Count(x => x.IsNotNullOrWhiteSpace()) > 1 ||
tracks.Select(x => x.FileTrackInfo.ReleaseMBId).Distinct().Count(x => x.IsNotNullOrWhiteSpace()) > 1)
{
_logger.Trace("LooksLikeSingleRelease: MBIDs are not unique");
return false;
@ -159,7 +160,7 @@ public static bool IsVariousAuthors(List<LocalBook> tracks)
const double authorTagThreshold = 0.75;
const double tagFuzz = 0.9;
var authorTags = tracks.Select(x => x.FileTrackInfo.AuthorTitle);
var authorTags = tracks.Select(x => x.FileTrackInfo.AuthorTitle).ToList();
if (!HasCommonEntry(authorTags, authorTagThreshold, tagFuzz))
{
@ -185,7 +186,7 @@ private IEnumerable<List<LocalBook>> GroupTracksByDirectory(List<LocalBook> trac
// and group them.
// we only bother doing this for the immediate parent directory.
var trackFolders = tracks.Select(x => Tuple.Create(x, Path.GetDirectoryName(x.Path)));
var trackFolders = tracks.Select(x => Tuple.Create(x, Path.GetDirectoryName(x.Path))).ToList();
var distinctFolders = trackFolders.Select(x => x.Item2).Distinct().ToList();
distinctFolders.Sort();