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

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

@@ -49,10 +49,10 @@ namespace Aaru.DiscImages
public sealed partial class CloneCd
{
/// <inheritdoc />
public bool Open(IFilter imageFilter)
public ErrorNumber Open(IFilter imageFilter)
{
if(imageFilter == null)
return false;
return ErrorNumber.NoSuchFile;
_ccdFilter = imageFilter;
@@ -132,8 +132,11 @@ namespace Aaru.DiscImages
inEntry ||
inTrack ||
inCdText)
throw new
FeatureUnsupportedImageException($"Found [CloneCD] out of order in line {lineNumber}");
{
AaruConsole.ErrorWriteLine($"Found [CloneCD] out of order in line {lineNumber}");
return ErrorNumber.InvalidArgument;
}
inCcd = true;
inDisk = false;
@@ -367,7 +370,11 @@ namespace Aaru.DiscImages
entries.Add(currentEntry);
if(entries.Count == 0)
throw new FeatureUnsupportedImageException("Did not find any track.");
{
AaruConsole.ErrorWriteLine("Did not find any track.");
return ErrorNumber.InvalidArgument;
}
FullTOC.CDFullTOC toc;
toc.TrackDescriptors = entries.ToArray();
@@ -403,7 +410,11 @@ namespace Aaru.DiscImages
_dataFilter = filtersList.GetFilter(dataFile);
if(_dataFilter == null)
throw new Exception("Cannot open data file");
{
AaruConsole.ErrorWriteLine("Cannot open data file");
return ErrorNumber.NoSuchFile;
}
filtersList = new FiltersList();
_subFilter = filtersList.GetFilter(subFile);
@@ -884,15 +895,14 @@ namespace Aaru.DiscImages
_imageInfo.LastModificationTime = imageFilter.LastWriteTime;
_imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
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;
}
}