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

Remove all image thrown exceptions.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-21 04:55:28 +01:00
parent f0c3653158
commit 42597b89cf
49 changed files with 934 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Aaru.Images/HDCopy/Helpers.cs
View File

@@ -33,6 +33,8 @@
using System;
using System.IO;
using Aaru.CommonTypes.Enums;
using Aaru.Console;
namespace Aaru.DiscImages
{
@@ -96,14 +98,18 @@ namespace Aaru.DiscImages
return true;
}
void ReadTrackIntoCache(Stream stream, int trackNum)
ErrorNumber ReadTrackIntoCache(Stream stream, int trackNum)
{
byte[] trackData = new byte[_imageInfo.SectorSize * _imageInfo.SectorsPerTrack];
byte[] blkHeader = new byte[3];
// check that track is present
if(_trackOffset[trackNum] == -1)
throw new InvalidDataException("Tried reading a track that is not present in image");
{
AaruConsole.ErrorWriteLine("Tried reading a track that is not present in image");
return ErrorNumber.SectorNotFound;
}
stream.Seek(_trackOffset[trackNum], SeekOrigin.Begin);
@@ -135,10 +141,16 @@ namespace Aaru.DiscImages
// check that the number of bytes decompressed matches a whole track
if(dIndex != _imageInfo.SectorSize * _imageInfo.SectorsPerTrack)
throw new InvalidDataException("Track decompression yielded incomplete data");
{
AaruConsole.ErrorWriteLine("Track decompression yielded incomplete data");
return ErrorNumber.InOutError;
}
// store track in cache
_trackCache[trackNum] = trackData;
return ErrorNumber.NoError;
}
}
}