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 20:22:33 +02:00
parent 5a04dc2491
commit b9255b8b3e
3 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,6 @@ public partial class Convert
(long)doneSectors,
(long)trackSectors);
bool useNotLong = false;
bool result = false;
SectorStatus sectorStatus = SectorStatus.NotDumped;
SectorStatus[] sectorStatusArray = new SectorStatus[1];
@@ -112,21 +111,8 @@ public partial class Convert
}
}
if(!result && sector.Length % 2352 != 0)
{
if(!_force)
{
StoppingErrorMessage
?.Invoke(UI.Input_image_is_not_returning_raw_sectors_use_force_if_you_want_to_continue);
return ErrorNumber.InOutError;
}
useNotLong = true;
}
}
if(!useLong || useNotLong)
else
{
errno = sectorsToDo == 1
? inputOptical.ReadSector(doneSectors + track.StartSector,

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

@@ -117,12 +117,6 @@ public sealed partial class Merger
return ErrorNumber.WriteError;
}
if(!result && sector.Length % 2352 != 0)
{
StoppingErrorMessage?.Invoke(UI.Input_image_is_not_returning_long_sectors_not_continuing);
return ErrorNumber.InOutError;
}
}
else
{
@@ -252,12 +246,6 @@ public sealed partial class Merger
return ErrorNumber.WriteError;
}
if(!result && sector.Length % 2352 != 0)
{
StoppingErrorMessage?.Invoke(UI.Input_image_is_not_returning_long_sectors_not_continuing);
return ErrorNumber.InOutError;
}
}
else
{

24
Aaru.Filesystems/ISO9660/Mode2.cs
View File

@@ -135,14 +135,9 @@ public sealed partial class ISO9660
if(_blockSize == 2048)
{
if(data.Length == 2064)
{
buffer = Decoders.DVD.Sector.GetUserData(data);
}
else
{
buffer = Sector.GetUserData(data, interleaved, fileNumber);
}
buffer = data.Length == 2064
? Decoders.DVD.Sector.GetUserData(data)
: Sector.GetUserData(data, interleaved, fileNumber);
return ErrorNumber.NoError;
}
@@ -239,16 +234,9 @@ public sealed partial class ISO9660
}
}
byte[] sectorData;
if(data.Length == 2064)
{
sectorData = Decoders.DVD.Sector.GetUserData(data);
}
else
{
sectorData = Sector.GetUserData(data, interleaved, fileNumber);
}
byte[] sectorData = data.Length == 2064
? Decoders.DVD.Sector.GetUserData(data)
: Sector.GetUserData(data, interleaved, fileNumber);
ms.Write(sectorData, 0, sectorData.Length);
}