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

14
Aaru.Images/Alcohol120/Read.cs
View File

@@ -50,13 +50,13 @@ namespace Aaru.DiscImages
public sealed partial class Alcohol120
{
/// <inheritdoc />
public bool Open(IFilter imageFilter)
public ErrorNumber Open(IFilter imageFilter)
{
Stream stream = imageFilter.GetDataForkStream();
stream.Seek(0, SeekOrigin.Begin);
if(stream.Length < 88)
return false;
return ErrorNumber.InvalidArgument;
_isDvd = false;
byte[] hdr = new byte[88];
@@ -99,7 +99,7 @@ namespace Aaru.DiscImages
AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.dpmOffset = {0}", _header.dpmOffset);
if(_header.version[0] > MAXIMUM_SUPPORTED_VERSION)
return false;
return ErrorNumber.NotSupported;
stream.Seek(_header.sessionOffset, SeekOrigin.Begin);
_alcSessions = new Dictionary<int, Session>();
@@ -678,7 +678,11 @@ namespace Aaru.DiscImages
_alcImage = filtersList.GetFilter(alcFile);
if(_alcImage == null)
throw new Exception("Cannot open data file");
{
AaruConsole.ErrorWriteLine("Cannot open data file");
return ErrorNumber.NoSuchFile;
}
_imageInfo.ImageSize = (ulong)_alcImage.DataForkLength;
_imageInfo.CreationTime = _alcImage.CreationTime;
@@ -742,7 +746,7 @@ namespace Aaru.DiscImages
AaruConsole.
WriteLine("Incorrect Alcohol 120% image created by an old version of Aaru. Convert image to correct it.");
return true;
return ErrorNumber.NoError;
}
/// <inheritdoc />