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

Add detection of Castlewood Orb 2.2Gb cart.

Browse Source
This commit is contained in:
Natalia Portillo
2020-02-02 18:48:56 +00:00
parent 1973ce799c
commit 6272289745
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.CommonTypes

Submodule DiscImageChef.CommonTypes updated: e34d234ed5...3f0f9c53a1

19
DiscImageChef/Commands/Image/Convert.cs
View File

@@ -46,6 +46,7 @@ using DiscImageChef.Console;
using DiscImageChef.Core; using DiscImageChef.Core;
using Schemas; using Schemas;
using ImageInfo = DiscImageChef.CommonTypes.Structs.ImageInfo; using ImageInfo = DiscImageChef.CommonTypes.Structs.ImageInfo;
using MediaType = DiscImageChef.CommonTypes.MediaType;
using Version = DiscImageChef.CommonTypes.Interop.Version; using Version = DiscImageChef.CommonTypes.Interop.Version;
namespace DiscImageChef.Commands.Image namespace DiscImageChef.Commands.Image
@@ -247,6 +248,7 @@ namespace DiscImageChef.Commands.Image
Resume resume = null; Resume resume = null;
CICMMetadataType sidecar = null; CICMMetadataType sidecar = null;
MediaType mediaType;
var xs = new XmlSerializer(typeof(CICMMetadataType)); var xs = new XmlSerializer(typeof(CICMMetadataType));
@@ -339,6 +341,14 @@ namespace DiscImageChef.Commands.Image
return(int)ErrorNumber.CannotOpenFormat; return(int)ErrorNumber.CannotOpenFormat;
} }
mediaType = inputFormat.Info.MediaType;
// Obsolete types
#pragma warning disable 612
if(mediaType == MediaType.SQ1500)
mediaType = MediaType.SyJet;
#pragma warning restore 612
DicConsole.DebugWriteLine("Convert-image command", "Correctly opened image file."); DicConsole.DebugWriteLine("Convert-image command", "Correctly opened image file.");
DicConsole.DebugWriteLine("Convert-image command", "Image without headers is {0} bytes.", DicConsole.DebugWriteLine("Convert-image command", "Image without headers is {0} bytes.",
@@ -346,11 +356,10 @@ namespace DiscImageChef.Commands.Image
DicConsole.DebugWriteLine("Convert-image command", "Image has {0} sectors.", inputFormat.Info.Sectors); DicConsole.DebugWriteLine("Convert-image command", "Image has {0} sectors.", inputFormat.Info.Sectors);
DicConsole.DebugWriteLine("Convert-image command", "Image identifies media type as {0}.", DicConsole.DebugWriteLine("Convert-image command", "Image identifies media type as {0}.", mediaType);
inputFormat.Info.MediaType);
Statistics.AddMediaFormat(inputFormat.Format); Statistics.AddMediaFormat(inputFormat.Format);
Statistics.AddMedia(inputFormat.Info.MediaType, false); Statistics.AddMedia(mediaType, false);
Statistics.AddFilter(inputFilter.Name); Statistics.AddFilter(inputFilter.Name);
} }
catch(Exception ex) catch(Exception ex)
@@ -401,7 +410,7 @@ namespace DiscImageChef.Commands.Image
else else
DicConsole.WriteLine("Output image format: {0}.", outputFormat.Name); DicConsole.WriteLine("Output image format: {0}.", outputFormat.Name);
if(!outputFormat.SupportedMediaTypes.Contains(inputFormat.Info.MediaType)) if(!outputFormat.SupportedMediaTypes.Contains(mediaType))
{ {
DicConsole.ErrorWriteLine("Output format does not support media type, cannot continue..."); DicConsole.ErrorWriteLine("Output format does not support media type, cannot continue...");
@@ -444,7 +453,7 @@ namespace DiscImageChef.Commands.Image
return(int)ErrorNumber.DataWillBeLost; return(int)ErrorNumber.DataWillBeLost;
} }
if(!outputFormat.Create(outputPath, inputFormat.Info.MediaType, parsedOptions, inputFormat.Info.Sectors, if(!outputFormat.Create(outputPath, mediaType, parsedOptions, inputFormat.Info.Sectors,
inputFormat.Info.SectorSize)) inputFormat.Info.SectorSize))
{ {
DicConsole.ErrorWriteLine("Error {0} creating output image.", outputFormat.ErrorMessage); DicConsole.ErrorWriteLine("Error {0} creating output image.", outputFormat.ErrorMessage);