From 15b36ff898b80ad56b6454099f53a08b35674e73 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 14 Nov 2022 01:04:32 +0000 Subject: [PATCH] Use LINQ's MinBy and MaxBy. --- Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs | 2 +- Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs | 4 ++-- Aaru.Images/CDRWin/Read.cs | 2 +- Aaru.Images/CDRWin/Write.cs | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs index e624c4ca4..449c720b2 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs @@ -1338,7 +1338,7 @@ sealed partial class Dump foreach(Track trk in tracks) { // Fix track starts in each session's first track - if(tracks.Where(t => t.Session == trk.Session).OrderBy(t => t.Sequence).FirstOrDefault().Sequence == + if(tracks.Where(t => t.Session == trk.Session).MinBy(t => t.Sequence).Sequence == trk.Sequence) { if(trk.Sequence == 1) diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs index 60dc2d205..23fa1d519 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs @@ -201,7 +201,7 @@ partial class Dump var trackRetries = 0; // First track of each session has at least 150 sectors of pregap and is not always readable - if(tracks.Where(trk => trk.Session == track.Session).OrderBy(trk => trk.Sequence).FirstOrDefault(). + if(tracks.Where(trk => trk.Session == track.Session).MinBy(trk => trk.Sequence). Sequence == track.Sequence) { AaruConsole.DebugWriteLine("Pregap calculator", "Skipping track {0}", track.Sequence); @@ -587,7 +587,7 @@ partial class Dump trk.Pregap = (ulong)pregaps[trk.Sequence]; // Do not reduce pregap, or starting position of session's first track - if(tracks.Where(t => t.Session == trk.Session).OrderBy(t => t.Sequence).FirstOrDefault().Sequence == + if(tracks.Where(t => t.Session == trk.Session).MinBy(t => t.Sequence).Sequence == trk.Sequence) continue; diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index a88bb356b..137bbe1d7 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -1330,7 +1330,7 @@ public sealed partial class CdrWin for(var s = 1; s <= sessions.Length; s++) _discImage.Sessions.Add(sessions[s - 1]); - _imageInfo.Sectors = _discImage.Sessions.OrderByDescending(s => s.EndSector).First().EndSector + 1; + _imageInfo.Sectors = _discImage.Sessions.MaxBy(s => s.EndSector).EndSector + 1; AaruConsole.DebugWriteLine("CDRWin plugin", "Session information:"); AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc contains {0} sessions", _discImage.Sessions.Count); diff --git a/Aaru.Images/CDRWin/Write.cs b/Aaru.Images/CDRWin/Write.cs index 5eba9ed7a..438e5b619 100644 --- a/Aaru.Images/CDRWin/Write.cs +++ b/Aaru.Images/CDRWin/Write.cs @@ -573,8 +573,7 @@ public sealed partial class CdrWin if(currentSession >= lastSession) continue; - Track lastTrackInSession = _writingTracks.Where(t => t.Session == currentSession).OrderBy(t => t.Sequence). - LastOrDefault(); + Track lastTrackInSession = _writingTracks.Where(t => t.Session == currentSession).MaxBy(t => t.Sequence); if(track.Sequence != lastTrackInSession.Sequence) continue;