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

Refactor IMediaImage.Open to return error status instead of boolean.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-16 19:10:39 +01:00
parent ac275aa8cb
commit ef2fc1788a
86 changed files with 699 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Aaru.Images/CDRWin/Read.cs
View File

@@ -52,10 +52,10 @@ namespace Aaru.DiscImages
public sealed partial class CdrWin
{
/// <inheritdoc />
public bool Open(IFilter imageFilter)
public ErrorNumber Open(IFilter imageFilter)
{
if(imageFilter == null)
return false;
return ErrorNumber.InvalidArgument;
_cdrwinFilter = imageFilter;
@@ -814,13 +814,16 @@ namespace Aaru.DiscImages
AaruConsole.
ErrorWriteLine("This image from PowerISO is damaged beyond possible recovery. Will not open.");
return false;
return ErrorNumber.InvalidArgument;
}
else if(line == "") // Empty line, ignore it
{}
else // Non-empty unknown field
throw new
FeatureUnsupportedImageException($"Found unknown field defined at line {lineNumber}: \"{line}\"");
{
AaruConsole.ErrorWriteLine($"Found unknown field defined at line {lineNumber}: \"{line}\"");
return ErrorNumber.NotSupported;
}
}
}
@@ -847,7 +850,7 @@ namespace Aaru.DiscImages
AaruConsole.
ErrorWriteLine("The data files are not correct according to the cuesheet file, cannot continue with this file.");
return false;
return ErrorNumber.InvalidArgument;
}
cueTracks[0].Pregap = cueTracks[0].Indexes[1];
@@ -861,7 +864,7 @@ namespace Aaru.DiscImages
AaruConsole.
ErrorWriteLine("The data files are not correct according to the cuesheet file, cannot continue with this file.");
return false;
return ErrorNumber.InvalidArgument;
}
cueTracks[currentTrack.Sequence - 1].Sectors =
@@ -1540,15 +1543,14 @@ namespace Aaru.DiscImages
_discImage.Sessions = sessions.ToList();
}
return true;
return ErrorNumber.NoError;
}
catch(Exception ex)
{
AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.Filename);
AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
AaruConsole.ErrorWriteLine("Exception: {0}", ex);
return false;
return ErrorNumber.UnexpectedException;
}
}