aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix checking track does not exist.

Browse Source
This commit is contained in:
Natalia Portillo
2020-06-21 14:49:25 +01:00
parent 5ebb465901
commit e4ce5bc32d
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Core/Devices/Dumping/CompactDisc/CdiReady.cs
View File

@@ -92,7 +92,7 @@ namespace Aaru.Core.Devices.Dumping
const uint sectorSize = 2352; // Full sector size
Track firstTrack = tracks.FirstOrDefault(t => t.TrackSequence == 1);
if(firstTrack.TrackSequence == 0)
if(firstTrack is null)
return;
InitProgress?.Invoke();

2
Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
View File

@@ -817,7 +817,7 @@ namespace Aaru.Core.Devices.Dumping
{
Track track = tracks.FirstOrDefault(t => t.TrackSequence == kvp.Key);
if(track.TrackSequence == 0)
if(track is null)
continue;
_dumpLog.WriteLine("Setting flags for track {0}...", track.TrackSequence);

4
Aaru.Core/Media/Info/CompactDisc.cs
View File

@@ -224,8 +224,8 @@ namespace Aaru.Core.Media.Info
break;
}
if(dataTrack.TrackSequence == 0 ||
audioTrack.TrackSequence == 0)
if(dataTrack is null ||
audioTrack is null)
return;
// Found them

12
Aaru.Images/Alcohol120/Write.cs
View File

@@ -210,7 +210,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -253,7 +253,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -328,7 +328,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -366,7 +366,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -975,7 +975,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -1042,7 +1042,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";

6
Aaru.Images/BlindWrite4/Read.cs
View File

@@ -868,7 +868,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1)
@@ -972,7 +972,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1)
@@ -1189,7 +1189,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > (aaruTrack.TrackEndSector - aaruTrack.TrackStartSector) + 1)

6
Aaru.Images/BlindWrite5/Read.cs
View File

@@ -1245,7 +1245,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > aaruTrack.TrackEndSector)
@@ -1379,7 +1379,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > aaruTrack.TrackEndSector)
@@ -1818,7 +1818,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > aaruTrack.TrackEndSector)

12
Aaru.Images/CDRDAO/Write.cs
View File

@@ -144,7 +144,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -210,7 +210,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -308,7 +308,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -369,7 +369,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -641,7 +641,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -724,7 +724,7 @@ namespace Aaru.DiscImages
writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";

10
Aaru.Images/CDRWin/Write.cs
View File

@@ -152,7 +152,7 @@ namespace Aaru.DiscImages
_writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -204,7 +204,7 @@ namespace Aaru.DiscImages
_writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -263,7 +263,7 @@ namespace Aaru.DiscImages
_writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -308,7 +308,7 @@ namespace Aaru.DiscImages
_writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -564,7 +564,7 @@ namespace Aaru.DiscImages
_writingTracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";

6
Aaru.Images/CloneCD/Read.cs
View File

@@ -854,7 +854,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if((length + sectorAddress) - 1 > aaruTrack.TrackEndSector)
@@ -954,7 +954,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if((length + sectorAddress) - 1 > aaruTrack.TrackEndSector)
@@ -1242,7 +1242,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if((length + sectorAddress) - 1 > aaruTrack.TrackEndSector)

8
Aaru.Images/CloneCD/Write.cs
View File

@@ -155,7 +155,7 @@ namespace Aaru.DiscImages
Tracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -190,7 +190,7 @@ namespace Aaru.DiscImages
Tracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -524,7 +524,7 @@ namespace Aaru.DiscImages
Tracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";
@@ -603,7 +603,7 @@ namespace Aaru.DiscImages
Tracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
sectorAddress <= trk.TrackEndSector);
if(track.TrackSequence == 0)
if(track is null)
{
ErrorMessage = $"Can't found track containing {sectorAddress}";

6
Aaru.Images/DiscJuggler/Read.cs
View File

@@ -777,7 +777,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > aaruTrack.TrackEndSector)
@@ -898,7 +898,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > aaruTrack.TrackEndSector)
@@ -1174,7 +1174,7 @@ namespace Aaru.DiscImages
break;
}
if(aaruTrack.TrackSequence == 0)
if(aaruTrack is null)
throw new ArgumentOutOfRangeException(nameof(track), "Track does not exist in disc image");
if(length + sectorAddress > aaruTrack.TrackEndSector)