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

33
Aaru.Images/NDIF/Read.cs
View File

@@ -36,7 +36,6 @@ using System.IO;
using System.Linq;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Exceptions;
using Aaru.CommonTypes.Interfaces;
using Aaru.Compression;
using Aaru.Console;
@@ -149,13 +148,17 @@ namespace Aaru.DiscImages
switch(bChnk.type)
{
case CHUNK_TYPE_KENCODE:
throw new
ImageNotSupportedException("Chunks compressed with KenCode are not yet supported.");
AaruConsole.ErrorWriteLine("Chunks compressed with KenCode are not yet supported.");
return ErrorNumber.NotImplemented;
case CHUNK_TYPE_LZH:
throw new ImageNotSupportedException("Chunks compressed with LZH are not yet supported.");
AaruConsole.ErrorWriteLine("Chunks compressed with LZH are not yet supported.");
return ErrorNumber.NotImplemented;
case CHUNK_TYPE_STUFFIT:
throw new
ImageNotSupportedException("Chunks compressed with StuffIt! are not yet supported.");
AaruConsole.ErrorWriteLine("Chunks compressed with StuffIt! are not yet supported.");
return ErrorNumber.NotImplemented;
}
// TODO: Handle compressed chunks
@@ -163,7 +166,11 @@ namespace Aaru.DiscImages
(bChnk.type > CHUNK_TYPE_ADC && bChnk.type < CHUNK_TYPE_STUFFIT) ||
(bChnk.type > CHUNK_TYPE_STUFFIT && bChnk.type < CHUNK_TYPE_END) ||
bChnk.type == 1)
throw new ImageNotSupportedException($"Unsupported chunk type 0x{bChnk.type:X8} found");
{
AaruConsole.ErrorWriteLine($"Unsupported chunk type 0x{bChnk.type:X8} found");
return ErrorNumber.InvalidArgument;
}
_chunks.Add(bChnk.sector, bChnk);
}
@@ -172,10 +179,18 @@ namespace Aaru.DiscImages
}
if(_header.segmented > 0)
throw new ImageNotSupportedException("Segmented images are not yet supported.");
{
AaruConsole.ErrorWriteLine("Segmented images are not yet supported.");
return ErrorNumber.NotImplemented;
}
if(_header.encrypted > 0)
throw new ImageNotSupportedException("Encrypted images are not yet supported.");
{
AaruConsole.ErrorWriteLine("Encrypted images are not yet supported.");
return ErrorNumber.NotImplemented;
}
switch(_imageInfo.Sectors)
{