From 5a04dc2491b061edc9302216a3533b9cd46bfe6b Mon Sep 17 00:00:00 2001 From: Rebecca Wallander Date: Sun, 12 Apr 2026 17:50:24 +0200 Subject: [PATCH] Address code quality issues --- Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs | 7 +------ Aaru.Core/Image/Merge/MergeCssDvd.cs | 12 ++++-------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs b/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs index 2fe09b8d6..0839d95a0 100644 --- a/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs +++ b/Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs @@ -39,12 +39,7 @@ public partial class Convert if(_aborted) break; byte[] sector; - uint sectorsToDo; - - if(trackSectors - doneSectors >= _count) - sectorsToDo = _count; - else - sectorsToDo = (uint)(trackSectors - doneSectors); + uint sectorsToDo = trackSectors - doneSectors >= _count ? _count : (uint)(trackSectors - doneSectors); UpdateProgress2?.Invoke(string.Format(UI.Converting_sectors_0_to_1_in_track_2, doneSectors + track.StartSector, diff --git a/Aaru.Core/Image/Merge/MergeCssDvd.cs b/Aaru.Core/Image/Merge/MergeCssDvd.cs index 09fd8860f..6125afd9c 100644 --- a/Aaru.Core/Image/Merge/MergeCssDvd.cs +++ b/Aaru.Core/Image/Merge/MergeCssDvd.cs @@ -54,12 +54,9 @@ public sealed partial class Merger byte[] sector; - uint sectorsToDo; - - if(trackSectors - doneSectors >= (ulong)count) - sectorsToDo = (uint)count; - else - sectorsToDo = (uint)(trackSectors - doneSectors); + uint sectorsToDo = trackSectors - doneSectors >= (ulong)count + ? (uint)count + : (uint)(trackSectors - doneSectors); UpdateProgress2?.Invoke(string.Format(UI.Copying_sectors_0_to_1_in_track_2, doneSectors + track.StartSector, @@ -212,8 +209,7 @@ public sealed partial class Merger int howManySectorsToCopy = sectorsToCopy.Count(t => t < inputOptical.Info.Sectors); int howManySectorsCopied = 0; - foreach(ulong sectorAddress in sectorsToCopy.Where(t => t < inputOptical.Info.Sectors) - .TakeWhile(_ => !_aborted)) + foreach(ulong sectorAddress in sectorsToCopy.Where(t => t < inputOptical.Info.Sectors)) { UpdateProgress?.Invoke(string.Format(UI.Copying_sector_0, sectorAddress), howManySectorsCopied,