aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-07-08 18:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address code quality issues

Browse Source
This commit is contained in:
Rebecca Wallander
2026-04-12 17:50:24 +02:00
parent 65988263cf
commit 5a04dc2491
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Aaru.Core/Image/Convert/CSS/ConvertCssDvd.cs
View File

@@ -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,

12
Aaru.Core/Image/Merge/MergeCssDvd.cs
View File

@@ -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,