mirror of
https://github.com/aaru-dps/Aaru.Server.git
synced 2025-12-16 19:24:27 +00:00
Refactor most disk references to media.
This commit is contained in:
@@ -1,3 +1,13 @@
|
||||
2016-01-16 Natalia Portillo <claunia@claunia.com>
|
||||
|
||||
* Commands/Decode.cs:
|
||||
* Commands/Verify.cs:
|
||||
* Commands/Analyze.cs:
|
||||
* Commands/Compare.cs:
|
||||
* Commands/MediaInfo.cs:
|
||||
* Commands/CreateSidecar.cs:
|
||||
Refactor most disk references to media.
|
||||
|
||||
2016-01-16 Natalia Portillo <claunia@claunia.com>
|
||||
|
||||
* Commands/CreateSidecar.cs:
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace DiscImageChef.Commands
|
||||
DicConsole.DebugWriteLine("Analyze command", "Correctly opened image file.");
|
||||
DicConsole.DebugWriteLine("Analyze command", "Image without headers is {0} bytes.", _imageFormat.GetImageSize());
|
||||
DicConsole.DebugWriteLine("Analyze command", "Image has {0} sectors.", _imageFormat.GetSectors());
|
||||
DicConsole.DebugWriteLine("Analyze command", "Image identifies disk type as {0}.", _imageFormat.GetDiskType());
|
||||
DicConsole.DebugWriteLine("Analyze command", "Image identifies disk type as {0}.", _imageFormat.GetMediaType());
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -117,8 +117,8 @@ namespace DiscImageChef.Commands
|
||||
ImageInfo image2Info = new ImageInfo();
|
||||
List<Session> image1Sessions = new List<Session>();
|
||||
List<Session> image2Sessions = new List<Session>();
|
||||
Dictionary<DiskTagType, byte[]> image1DiskTags = new Dictionary<DiskTagType, byte[]>();
|
||||
Dictionary<DiskTagType, byte[]> image2DiskTags = new Dictionary<DiskTagType, byte[]>();
|
||||
Dictionary<MediaTagType, byte[]> image1DiskTags = new Dictionary<MediaTagType, byte[]>();
|
||||
Dictionary<MediaTagType, byte[]> image2DiskTags = new Dictionary<MediaTagType, byte[]>();
|
||||
|
||||
image1Info.imageHasPartitions = input1Format.ImageHasPartitions();
|
||||
try{ image1Sessions = input1Format.GetSessions(); } catch{}
|
||||
@@ -129,24 +129,24 @@ namespace DiscImageChef.Commands
|
||||
image1Info.sectorSize = input1Format.GetSectorSize();
|
||||
image1Info.imageCreationTime = input1Format.GetImageCreationTime();
|
||||
image1Info.imageLastModificationTime = input1Format.GetImageLastModificationTime();
|
||||
image1Info.diskType = input1Format.GetDiskType();
|
||||
image1Info.mediaType = input1Format.GetMediaType();
|
||||
try{ image1Info.imageVersion = input1Format.GetImageVersion(); } catch{ image1Info.imageVersion = null;}
|
||||
try{ image1Info.imageApplication = input1Format.GetImageApplication(); } catch{ image1Info.imageApplication = null;}
|
||||
try{ image1Info.imageApplicationVersion = input1Format.GetImageApplicationVersion(); } catch{ image1Info.imageApplicationVersion = null;}
|
||||
try{ image1Info.imageCreator = input1Format.GetImageCreator(); } catch{ image1Info.imageCreator = null;}
|
||||
try{ image1Info.imageName = input1Format.GetImageName(); } catch{ image1Info.imageName = null;}
|
||||
try{ image1Info.imageComments = input1Format.GetImageComments(); } catch{ image1Info.imageComments = null;}
|
||||
try{ image1Info.diskManufacturer = input1Format.GetDiskManufacturer(); } catch{ image1Info.diskManufacturer = null;}
|
||||
try{ image1Info.diskModel = input1Format.GetDiskModel(); } catch{ image1Info.diskModel = null;}
|
||||
try{ image1Info.diskSerialNumber = input1Format.GetDiskSerialNumber(); } catch{ image1Info.diskSerialNumber = null;}
|
||||
try{ image1Info.diskBarcode = input1Format.GetDiskBarcode(); } catch{ image1Info.diskBarcode = null;}
|
||||
try{ image1Info.diskPartNumber = input1Format.GetDiskPartNumber(); } catch{ image1Info.diskPartNumber = null;}
|
||||
try{ image1Info.diskSequence = input1Format.GetDiskSequence(); } catch{ image1Info.diskSequence = 0;}
|
||||
try{ image1Info.lastDiskSequence = input1Format.GetLastDiskSequence(); } catch{ image1Info.lastDiskSequence = 0;}
|
||||
try{ image1Info.mediaManufacturer = input1Format.GetMediaManufacturer(); } catch{ image1Info.mediaManufacturer = null;}
|
||||
try{ image1Info.mediaModel = input1Format.GetMediaModel(); } catch{ image1Info.mediaModel = null;}
|
||||
try{ image1Info.mediaSerialNumber = input1Format.GetMediaSerialNumber(); } catch{ image1Info.mediaSerialNumber = null;}
|
||||
try{ image1Info.mediaBarcode = input1Format.GetMediaBarcode(); } catch{ image1Info.mediaBarcode = null;}
|
||||
try{ image1Info.mediaPartNumber = input1Format.GetMediaPartNumber(); } catch{ image1Info.mediaPartNumber = null;}
|
||||
try{ image1Info.mediaSequence = input1Format.GetMediaSequence(); } catch{ image1Info.mediaSequence = 0;}
|
||||
try{ image1Info.lastMediaSequence = input1Format.GetLastDiskSequence(); } catch{ image1Info.lastMediaSequence = 0;}
|
||||
try{ image1Info.driveManufacturer = input1Format.GetDriveManufacturer(); } catch{ image1Info.driveManufacturer = null;}
|
||||
try{ image1Info.driveModel = input1Format.GetDriveModel(); } catch{ image1Info.driveModel = null;}
|
||||
try{ image1Info.driveSerialNumber = input1Format.GetDriveSerialNumber(); } catch{ image1Info.driveSerialNumber = null;}
|
||||
foreach (DiskTagType disktag in Enum.GetValues(typeof(DiskTagType)))
|
||||
foreach (MediaTagType disktag in Enum.GetValues(typeof(MediaTagType)))
|
||||
{
|
||||
try{
|
||||
byte[] temparray = input1Format.ReadDiskTag(disktag);
|
||||
@@ -165,24 +165,24 @@ namespace DiscImageChef.Commands
|
||||
image2Info.sectorSize = input2Format.GetSectorSize();
|
||||
image2Info.imageCreationTime = input2Format.GetImageCreationTime();
|
||||
image2Info.imageLastModificationTime = input2Format.GetImageLastModificationTime();
|
||||
image2Info.diskType = input2Format.GetDiskType();
|
||||
image2Info.mediaType = input2Format.GetMediaType();
|
||||
try{ image2Info.imageVersion = input2Format.GetImageVersion(); } catch{ image2Info.imageVersion = null;}
|
||||
try{ image2Info.imageApplication = input2Format.GetImageApplication(); } catch{ image2Info.imageApplication = null;}
|
||||
try{ image2Info.imageApplicationVersion = input2Format.GetImageApplicationVersion(); } catch{ image2Info.imageApplicationVersion = null;}
|
||||
try{ image2Info.imageCreator = input2Format.GetImageCreator(); } catch{ image2Info.imageCreator = null;}
|
||||
try{ image2Info.imageName = input2Format.GetImageName(); } catch{ image2Info.imageName = null;}
|
||||
try{ image2Info.imageComments = input2Format.GetImageComments(); } catch{ image2Info.imageComments = null;}
|
||||
try{ image2Info.diskManufacturer = input2Format.GetDiskManufacturer(); } catch{ image2Info.diskManufacturer = null;}
|
||||
try{ image2Info.diskModel = input2Format.GetDiskModel(); } catch{ image2Info.diskModel = null;}
|
||||
try{ image2Info.diskSerialNumber = input2Format.GetDiskSerialNumber(); } catch{ image2Info.diskSerialNumber = null;}
|
||||
try{ image2Info.diskBarcode = input2Format.GetDiskBarcode(); } catch{ image2Info.diskBarcode = null;}
|
||||
try{ image2Info.diskPartNumber = input2Format.GetDiskPartNumber(); } catch{ image2Info.diskPartNumber = null;}
|
||||
try{ image2Info.diskSequence = input2Format.GetDiskSequence(); } catch{ image2Info.diskSequence = 0;}
|
||||
try{ image2Info.lastDiskSequence = input2Format.GetLastDiskSequence(); } catch{ image2Info.lastDiskSequence = 0;}
|
||||
try{ image2Info.mediaManufacturer = input2Format.GetMediaManufacturer(); } catch{ image2Info.mediaManufacturer = null;}
|
||||
try{ image2Info.mediaModel = input2Format.GetMediaModel(); } catch{ image2Info.mediaModel = null;}
|
||||
try{ image2Info.mediaSerialNumber = input2Format.GetMediaSerialNumber(); } catch{ image2Info.mediaSerialNumber = null;}
|
||||
try{ image2Info.mediaBarcode = input2Format.GetMediaBarcode(); } catch{ image2Info.mediaBarcode = null;}
|
||||
try{ image2Info.mediaPartNumber = input2Format.GetMediaPartNumber(); } catch{ image2Info.mediaPartNumber = null;}
|
||||
try{ image2Info.mediaSequence = input2Format.GetMediaSequence(); } catch{ image2Info.mediaSequence = 0;}
|
||||
try{ image2Info.lastMediaSequence = input2Format.GetLastDiskSequence(); } catch{ image2Info.lastMediaSequence = 0;}
|
||||
try{ image2Info.driveManufacturer = input2Format.GetDriveManufacturer(); } catch{ image2Info.driveManufacturer = null;}
|
||||
try{ image2Info.driveModel = input2Format.GetDriveModel(); } catch{ image2Info.driveModel = null;}
|
||||
try{ image2Info.driveSerialNumber = input2Format.GetDriveSerialNumber(); } catch{ image2Info.driveSerialNumber = null;}
|
||||
foreach (DiskTagType disktag in Enum.GetValues(typeof(DiskTagType)))
|
||||
foreach (MediaTagType disktag in Enum.GetValues(typeof(MediaTagType)))
|
||||
{
|
||||
try{
|
||||
byte[] temparray = input2Format.ReadDiskTag(disktag);
|
||||
@@ -201,24 +201,24 @@ namespace DiscImageChef.Commands
|
||||
sb.AppendFormat("Sector size\t{0}\t{1}", image1Info.sectorSize, image2Info.sectorSize).AppendLine();
|
||||
sb.AppendFormat("Creation time\t{0}\t{1}", image1Info.imageCreationTime, image2Info.imageCreationTime).AppendLine();
|
||||
sb.AppendFormat("Last modification time\t{0}\t{1}", image1Info.imageLastModificationTime, image2Info.imageLastModificationTime).AppendLine();
|
||||
sb.AppendFormat("Disk type\t{0}\t{1}", image1Info.diskType, image2Info.diskType).AppendLine();
|
||||
sb.AppendFormat("Disk type\t{0}\t{1}", image1Info.mediaType, image2Info.mediaType).AppendLine();
|
||||
sb.AppendFormat("Image version\t{0}\t{1}", image1Info.imageVersion, image2Info.imageVersion).AppendLine();
|
||||
sb.AppendFormat("Image application\t{0}\t{1}", image1Info.imageApplication, image2Info.imageApplication).AppendLine();
|
||||
sb.AppendFormat("Image application version\t{0}\t{1}", image1Info.imageApplicationVersion, image2Info.imageApplicationVersion).AppendLine();
|
||||
sb.AppendFormat("Image creator\t{0}\t{1}", image1Info.imageCreator, image2Info.imageCreator).AppendLine();
|
||||
sb.AppendFormat("Image name\t{0}\t{1}", image1Info.imageName, image2Info.imageName).AppendLine();
|
||||
sb.AppendFormat("Image comments\t{0}\t{1}", image1Info.imageComments, image2Info.imageComments).AppendLine();
|
||||
sb.AppendFormat("Disk manufacturer\t{0}\t{1}", image1Info.diskManufacturer, image2Info.diskManufacturer).AppendLine();
|
||||
sb.AppendFormat("Disk model\t{0}\t{1}", image1Info.diskModel, image2Info.diskModel).AppendLine();
|
||||
sb.AppendFormat("Disk serial number\t{0}\t{1}", image1Info.diskSerialNumber, image2Info.diskSerialNumber).AppendLine();
|
||||
sb.AppendFormat("Disk barcode\t{0}\t{1}", image1Info.diskBarcode, image2Info.diskBarcode).AppendLine();
|
||||
sb.AppendFormat("Disk part no.\t{0}\t{1}", image1Info.diskPartNumber, image2Info.diskPartNumber).AppendLine();
|
||||
sb.AppendFormat("Disk sequence\t{0}\t{1}", image1Info.diskSequence, image2Info.diskSequence).AppendLine();
|
||||
sb.AppendFormat("Last disk on sequence\t{0}\t{1}", image1Info.lastDiskSequence, image2Info.lastDiskSequence).AppendLine();
|
||||
sb.AppendFormat("Disk manufacturer\t{0}\t{1}", image1Info.mediaManufacturer, image2Info.mediaManufacturer).AppendLine();
|
||||
sb.AppendFormat("Disk model\t{0}\t{1}", image1Info.mediaModel, image2Info.mediaModel).AppendLine();
|
||||
sb.AppendFormat("Disk serial number\t{0}\t{1}", image1Info.mediaSerialNumber, image2Info.mediaSerialNumber).AppendLine();
|
||||
sb.AppendFormat("Disk barcode\t{0}\t{1}", image1Info.mediaBarcode, image2Info.mediaBarcode).AppendLine();
|
||||
sb.AppendFormat("Disk part no.\t{0}\t{1}", image1Info.mediaPartNumber, image2Info.mediaPartNumber).AppendLine();
|
||||
sb.AppendFormat("Disk sequence\t{0}\t{1}", image1Info.mediaSequence, image2Info.mediaSequence).AppendLine();
|
||||
sb.AppendFormat("Last disk on sequence\t{0}\t{1}", image1Info.lastMediaSequence, image2Info.lastMediaSequence).AppendLine();
|
||||
sb.AppendFormat("Drive manufacturer\t{0}\t{1}", image1Info.driveManufacturer, image2Info.driveManufacturer).AppendLine();
|
||||
sb.AppendFormat("Drive model\t{0}\t{1}", image1Info.driveModel, image2Info.driveModel).AppendLine();
|
||||
sb.AppendFormat("Drive serial number\t{0}\t{1}", image1Info.driveSerialNumber, image2Info.driveSerialNumber).AppendLine();
|
||||
foreach (DiskTagType disktag in Enum.GetValues(typeof(DiskTagType)))
|
||||
foreach (MediaTagType disktag in Enum.GetValues(typeof(MediaTagType)))
|
||||
{
|
||||
sb.AppendFormat("Has {0}?\t{1}\t{2}", disktag, image1DiskTags.ContainsKey(disktag), image2DiskTags.ContainsKey(disktag)).AppendLine();
|
||||
}
|
||||
@@ -268,7 +268,7 @@ namespace DiscImageChef.Commands
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Image last modification time differ");
|
||||
}
|
||||
if (image1Info.diskType != image2Info.diskType)
|
||||
if (image1Info.mediaType != image2Info.mediaType)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
@@ -310,43 +310,43 @@ namespace DiscImageChef.Commands
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Image comments differ");
|
||||
}
|
||||
if (image1Info.diskManufacturer != image2Info.diskManufacturer)
|
||||
if (image1Info.mediaManufacturer != image2Info.mediaManufacturer)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Disk manufacturer differ");
|
||||
}
|
||||
if (image1Info.diskModel != image2Info.diskModel)
|
||||
if (image1Info.mediaModel != image2Info.mediaModel)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Disk model differ");
|
||||
}
|
||||
if (image1Info.diskSerialNumber != image2Info.diskSerialNumber)
|
||||
if (image1Info.mediaSerialNumber != image2Info.mediaSerialNumber)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Disk serial number differ");
|
||||
}
|
||||
if (image1Info.diskBarcode != image2Info.diskBarcode)
|
||||
if (image1Info.mediaBarcode != image2Info.mediaBarcode)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Disk barcode differ");
|
||||
}
|
||||
if (image1Info.diskPartNumber != image2Info.diskPartNumber)
|
||||
if (image1Info.mediaPartNumber != image2Info.mediaPartNumber)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Disk part number differ");
|
||||
}
|
||||
if (image1Info.diskSequence != image2Info.diskSequence)
|
||||
if (image1Info.mediaSequence != image2Info.mediaSequence)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
sb.AppendLine("Disk sequence differ");
|
||||
}
|
||||
if (image1Info.lastDiskSequence != image2Info.lastDiskSequence)
|
||||
if (image1Info.lastMediaSequence != image2Info.lastMediaSequence)
|
||||
{
|
||||
imagesDiffer = true;
|
||||
if (!options.Verbose)
|
||||
|
||||
@@ -322,10 +322,10 @@ namespace DiscImageChef.Commands
|
||||
sidecar.OpticalDisc[0].Image.Value = Path.GetFileName(options.InputFile);
|
||||
sidecar.OpticalDisc[0].Size = fi.Length;
|
||||
sidecar.OpticalDisc[0].Sequence = new SequenceType();
|
||||
if (_imageFormat.GetDiskSequence() != 0 && _imageFormat.GetLastDiskSequence() != 0)
|
||||
if (_imageFormat.GetMediaSequence() != 0 && _imageFormat.GetLastDiskSequence() != 0)
|
||||
{
|
||||
sidecar.OpticalDisc[0].Sequence.MediaSequence = _imageFormat.GetDiskSequence();
|
||||
sidecar.OpticalDisc[0].Sequence.TotalMedia = _imageFormat.GetDiskSequence();
|
||||
sidecar.OpticalDisc[0].Sequence.MediaSequence = _imageFormat.GetMediaSequence();
|
||||
sidecar.OpticalDisc[0].Sequence.TotalMedia = _imageFormat.GetMediaSequence();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -334,38 +334,38 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
sidecar.OpticalDisc[0].Sequence.MediaTitle = _imageFormat.GetImageName();
|
||||
|
||||
DiskType dskType = _imageFormat.ImageInfo.diskType;
|
||||
MediaType dskType = _imageFormat.ImageInfo.mediaType;
|
||||
|
||||
foreach (DiskTagType tagType in _imageFormat.ImageInfo.readableDiskTags)
|
||||
foreach (MediaTagType tagType in _imageFormat.ImageInfo.readableMediaTags)
|
||||
{
|
||||
switch (tagType)
|
||||
{
|
||||
case DiskTagType.CD_ATIP:
|
||||
case MediaTagType.CD_ATIP:
|
||||
sidecar.OpticalDisc[0].ATIP = new DumpType();
|
||||
sidecar.OpticalDisc[0].ATIP.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.CD_ATIP)).ToArray();
|
||||
sidecar.OpticalDisc[0].ATIP.Size = _imageFormat.ReadDiskTag(DiskTagType.CD_ATIP).Length;
|
||||
Decoders.CD.ATIP.CDATIP? atip = Decoders.CD.ATIP.Decode(_imageFormat.ReadDiskTag(DiskTagType.CD_ATIP));
|
||||
sidecar.OpticalDisc[0].ATIP.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.CD_ATIP)).ToArray();
|
||||
sidecar.OpticalDisc[0].ATIP.Size = _imageFormat.ReadDiskTag(MediaTagType.CD_ATIP).Length;
|
||||
Decoders.CD.ATIP.CDATIP? atip = Decoders.CD.ATIP.Decode(_imageFormat.ReadDiskTag(MediaTagType.CD_ATIP));
|
||||
if (atip.HasValue)
|
||||
{
|
||||
if (atip.Value.DDCD)
|
||||
dskType = atip.Value.DiscType ? DiskType.DDCDRW : DiskType.DDCDR;
|
||||
dskType = atip.Value.DiscType ? MediaType.DDCDRW : MediaType.DDCDR;
|
||||
else
|
||||
dskType = atip.Value.DiscType ? DiskType.CDRW : DiskType.CDR;
|
||||
dskType = atip.Value.DiscType ? MediaType.CDRW : MediaType.CDR;
|
||||
}
|
||||
break;
|
||||
case DiskTagType.DVD_BCA:
|
||||
case MediaTagType.DVD_BCA:
|
||||
sidecar.OpticalDisc[0].BCA = new DumpType();
|
||||
sidecar.OpticalDisc[0].BCA.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.DVD_BCA)).ToArray();
|
||||
sidecar.OpticalDisc[0].BCA.Size = _imageFormat.ReadDiskTag(DiskTagType.DVD_BCA).Length;
|
||||
sidecar.OpticalDisc[0].BCA.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.DVD_BCA)).ToArray();
|
||||
sidecar.OpticalDisc[0].BCA.Size = _imageFormat.ReadDiskTag(MediaTagType.DVD_BCA).Length;
|
||||
break;
|
||||
case DiskTagType.BD_BCA:
|
||||
case MediaTagType.BD_BCA:
|
||||
sidecar.OpticalDisc[0].BCA = new DumpType();
|
||||
sidecar.OpticalDisc[0].BCA.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.BD_BCA)).ToArray();
|
||||
sidecar.OpticalDisc[0].BCA.Size = _imageFormat.ReadDiskTag(DiskTagType.BD_BCA).Length;
|
||||
sidecar.OpticalDisc[0].BCA.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.BD_BCA)).ToArray();
|
||||
sidecar.OpticalDisc[0].BCA.Size = _imageFormat.ReadDiskTag(MediaTagType.BD_BCA).Length;
|
||||
break;
|
||||
case DiskTagType.DVD_CMI:
|
||||
case MediaTagType.DVD_CMI:
|
||||
sidecar.OpticalDisc[0].CMI = new DumpType();
|
||||
Decoders.DVD.CSS_CPRM.LeadInCopyright? cmi = Decoders.DVD.CSS_CPRM.DecodeLeadInCopyright(_imageFormat.ReadDiskTag(DiskTagType.DVD_CMI));
|
||||
Decoders.DVD.CSS_CPRM.LeadInCopyright? cmi = Decoders.DVD.CSS_CPRM.DecodeLeadInCopyright(_imageFormat.ReadDiskTag(MediaTagType.DVD_CMI));
|
||||
if (cmi.HasValue)
|
||||
{
|
||||
switch (cmi.Value.CopyrightType)
|
||||
@@ -381,92 +381,92 @@ namespace DiscImageChef.Commands
|
||||
break;
|
||||
}
|
||||
}
|
||||
sidecar.OpticalDisc[0].CMI.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.DVD_CMI)).ToArray();
|
||||
sidecar.OpticalDisc[0].CMI.Size = _imageFormat.ReadDiskTag(DiskTagType.DVD_CMI).Length;
|
||||
sidecar.OpticalDisc[0].CMI.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.DVD_CMI)).ToArray();
|
||||
sidecar.OpticalDisc[0].CMI.Size = _imageFormat.ReadDiskTag(MediaTagType.DVD_CMI).Length;
|
||||
break;
|
||||
case DiskTagType.DVD_DMI:
|
||||
case MediaTagType.DVD_DMI:
|
||||
sidecar.OpticalDisc[0].DMI = new DumpType();
|
||||
sidecar.OpticalDisc[0].DMI.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.DVD_DMI)).ToArray();
|
||||
sidecar.OpticalDisc[0].DMI.Size = _imageFormat.ReadDiskTag(DiskTagType.DVD_DMI).Length;
|
||||
if (Decoders.Xbox.DMI.IsXbox(_imageFormat.ReadDiskTag(DiskTagType.DVD_DMI)))
|
||||
sidecar.OpticalDisc[0].DMI.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.DVD_DMI)).ToArray();
|
||||
sidecar.OpticalDisc[0].DMI.Size = _imageFormat.ReadDiskTag(MediaTagType.DVD_DMI).Length;
|
||||
if (Decoders.Xbox.DMI.IsXbox(_imageFormat.ReadDiskTag(MediaTagType.DVD_DMI)))
|
||||
{
|
||||
dskType = DiskType.XGD;
|
||||
dskType = MediaType.XGD;
|
||||
sidecar.OpticalDisc[0].Dimensions = new DimensionsType();
|
||||
sidecar.OpticalDisc[0].Dimensions.Diameter = 120;
|
||||
}
|
||||
else if (Decoders.Xbox.DMI.IsXbox360(_imageFormat.ReadDiskTag(DiskTagType.DVD_DMI)))
|
||||
else if (Decoders.Xbox.DMI.IsXbox360(_imageFormat.ReadDiskTag(MediaTagType.DVD_DMI)))
|
||||
{
|
||||
dskType = DiskType.XGD2;
|
||||
dskType = MediaType.XGD2;
|
||||
sidecar.OpticalDisc[0].Dimensions = new DimensionsType();
|
||||
sidecar.OpticalDisc[0].Dimensions.Diameter = 120;
|
||||
}
|
||||
break;
|
||||
case DiskTagType.DVD_PFI:
|
||||
case MediaTagType.DVD_PFI:
|
||||
sidecar.OpticalDisc[0].PFI = new DumpType();
|
||||
sidecar.OpticalDisc[0].PFI.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.DVD_PFI)).ToArray();
|
||||
sidecar.OpticalDisc[0].PFI.Size = _imageFormat.ReadDiskTag(DiskTagType.DVD_PFI).Length;
|
||||
Decoders.DVD.PFI.PhysicalFormatInformation? pfi = Decoders.DVD.PFI.Decode(_imageFormat.ReadDiskTag(DiskTagType.DVD_PFI));
|
||||
sidecar.OpticalDisc[0].PFI.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.DVD_PFI)).ToArray();
|
||||
sidecar.OpticalDisc[0].PFI.Size = _imageFormat.ReadDiskTag(MediaTagType.DVD_PFI).Length;
|
||||
Decoders.DVD.PFI.PhysicalFormatInformation? pfi = Decoders.DVD.PFI.Decode(_imageFormat.ReadDiskTag(MediaTagType.DVD_PFI));
|
||||
if (pfi.HasValue)
|
||||
{
|
||||
if (dskType != DiskType.XGD &&
|
||||
dskType != DiskType.XGD2 &&
|
||||
dskType != DiskType.XGD3)
|
||||
if (dskType != MediaType.XGD &&
|
||||
dskType != MediaType.XGD2 &&
|
||||
dskType != MediaType.XGD3)
|
||||
{
|
||||
switch (pfi.Value.DiskCategory)
|
||||
{
|
||||
case Decoders.DVD.DiskCategory.DVDPR:
|
||||
dskType = DiskType.DVDPR;
|
||||
dskType = MediaType.DVDPR;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDPRDL:
|
||||
dskType = DiskType.DVDPRDL;
|
||||
dskType = MediaType.DVDPRDL;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDPRW:
|
||||
dskType = DiskType.DVDPRW;
|
||||
dskType = MediaType.DVDPRW;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDPRWDL:
|
||||
dskType = DiskType.DVDPRWDL;
|
||||
dskType = MediaType.DVDPRWDL;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDR:
|
||||
dskType = DiskType.DVDR;
|
||||
dskType = MediaType.DVDR;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDRAM:
|
||||
dskType = DiskType.DVDRAM;
|
||||
dskType = MediaType.DVDRAM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDROM:
|
||||
dskType = DiskType.DVDROM;
|
||||
dskType = MediaType.DVDROM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDRW:
|
||||
dskType = DiskType.DVDRW;
|
||||
dskType = MediaType.DVDRW;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDR:
|
||||
dskType = DiskType.HDDVDR;
|
||||
dskType = MediaType.HDDVDR;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDRAM:
|
||||
dskType = DiskType.HDDVDRAM;
|
||||
dskType = MediaType.HDDVDRAM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDROM:
|
||||
dskType = DiskType.HDDVDROM;
|
||||
dskType = MediaType.HDDVDROM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDRW:
|
||||
dskType = DiskType.HDDVDRW;
|
||||
dskType = MediaType.HDDVDRW;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.Nintendo:
|
||||
dskType = DiskType.GOD;
|
||||
dskType = MediaType.GOD;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.UMD:
|
||||
dskType = DiskType.UMD;
|
||||
dskType = MediaType.UMD;
|
||||
break;
|
||||
}
|
||||
|
||||
if (dskType == DiskType.DVDR && pfi.Value.PartVersion == 6)
|
||||
dskType = DiskType.DVDRDL;
|
||||
if (dskType == DiskType.DVDRW && pfi.Value.PartVersion == 3)
|
||||
dskType = DiskType.DVDRWDL;
|
||||
if (dskType == DiskType.GOD && pfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.OneTwenty)
|
||||
dskType = DiskType.WOD;
|
||||
if (dskType == MediaType.DVDR && pfi.Value.PartVersion == 6)
|
||||
dskType = MediaType.DVDRDL;
|
||||
if (dskType == MediaType.DVDRW && pfi.Value.PartVersion == 3)
|
||||
dskType = MediaType.DVDRWDL;
|
||||
if (dskType == MediaType.GOD && pfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.OneTwenty)
|
||||
dskType = MediaType.WOD;
|
||||
|
||||
sidecar.OpticalDisc[0].Dimensions = new DimensionsType();
|
||||
if (dskType == DiskType.UMD)
|
||||
if (dskType == MediaType.UMD)
|
||||
sidecar.OpticalDisc[0].Dimensions.Diameter = 60;
|
||||
else if (pfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.Eighty)
|
||||
sidecar.OpticalDisc[0].Dimensions.Diameter = 80;
|
||||
@@ -475,16 +475,16 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
}
|
||||
break;
|
||||
case DiskTagType.CD_PMA:
|
||||
case MediaTagType.CD_PMA:
|
||||
sidecar.OpticalDisc[0].PMA = new DumpType();
|
||||
sidecar.OpticalDisc[0].PMA.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.CD_PMA)).ToArray();
|
||||
sidecar.OpticalDisc[0].PMA.Size = _imageFormat.ReadDiskTag(DiskTagType.CD_PMA).Length;
|
||||
sidecar.OpticalDisc[0].PMA.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.CD_PMA)).ToArray();
|
||||
sidecar.OpticalDisc[0].PMA.Size = _imageFormat.ReadDiskTag(MediaTagType.CD_PMA).Length;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
string dscType, dscSubType;
|
||||
Metadata.DiskType.DiskTypeToString(dskType, out dscType, out dscSubType);
|
||||
Metadata.MediaType.MediaTypeToString(dskType, out dscType, out dscSubType);
|
||||
sidecar.OpticalDisc[0].DiscType = dscType;
|
||||
sidecar.OpticalDisc[0].DiscSubType = dscSubType;
|
||||
|
||||
@@ -1084,10 +1084,10 @@ namespace DiscImageChef.Commands
|
||||
sidecar.BlockMedia[0].Image.Value = Path.GetFileName(options.InputFile);
|
||||
sidecar.BlockMedia[0].Size = fi.Length;
|
||||
sidecar.BlockMedia[0].Sequence = new SequenceType();
|
||||
if (_imageFormat.GetDiskSequence() != 0 && _imageFormat.GetLastDiskSequence() != 0)
|
||||
if (_imageFormat.GetMediaSequence() != 0 && _imageFormat.GetLastDiskSequence() != 0)
|
||||
{
|
||||
sidecar.BlockMedia[0].Sequence.MediaSequence = _imageFormat.GetDiskSequence();
|
||||
sidecar.BlockMedia[0].Sequence.TotalMedia = _imageFormat.GetDiskSequence();
|
||||
sidecar.BlockMedia[0].Sequence.MediaSequence = _imageFormat.GetMediaSequence();
|
||||
sidecar.BlockMedia[0].Sequence.TotalMedia = _imageFormat.GetMediaSequence();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1096,64 +1096,64 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
sidecar.BlockMedia[0].Sequence.MediaTitle = _imageFormat.GetImageName();
|
||||
|
||||
foreach (DiskTagType tagType in _imageFormat.ImageInfo.readableDiskTags)
|
||||
foreach (MediaTagType tagType in _imageFormat.ImageInfo.readableMediaTags)
|
||||
{
|
||||
switch (tagType)
|
||||
{
|
||||
case DiskTagType.ATAPI_IDENTIFY:
|
||||
case MediaTagType.ATAPI_IDENTIFY:
|
||||
sidecar.BlockMedia[0].ATA = new ATAType();
|
||||
sidecar.BlockMedia[0].ATA.Identify = new DumpType();
|
||||
sidecar.BlockMedia[0].ATA.Identify.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.ATAPI_IDENTIFY)).ToArray();
|
||||
sidecar.BlockMedia[0].ATA.Identify.Size = _imageFormat.ReadDiskTag(DiskTagType.ATAPI_IDENTIFY).Length;
|
||||
sidecar.BlockMedia[0].ATA.Identify.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.ATAPI_IDENTIFY)).ToArray();
|
||||
sidecar.BlockMedia[0].ATA.Identify.Size = _imageFormat.ReadDiskTag(MediaTagType.ATAPI_IDENTIFY).Length;
|
||||
break;
|
||||
case DiskTagType.ATA_IDENTIFY:
|
||||
case MediaTagType.ATA_IDENTIFY:
|
||||
sidecar.BlockMedia[0].ATA = new ATAType();
|
||||
sidecar.BlockMedia[0].ATA.Identify = new DumpType();
|
||||
sidecar.BlockMedia[0].ATA.Identify.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.ATA_IDENTIFY)).ToArray();
|
||||
sidecar.BlockMedia[0].ATA.Identify.Size = _imageFormat.ReadDiskTag(DiskTagType.ATA_IDENTIFY).Length;
|
||||
sidecar.BlockMedia[0].ATA.Identify.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.ATA_IDENTIFY)).ToArray();
|
||||
sidecar.BlockMedia[0].ATA.Identify.Size = _imageFormat.ReadDiskTag(MediaTagType.ATA_IDENTIFY).Length;
|
||||
break;
|
||||
case DiskTagType.PCMCIA_CIS:
|
||||
case MediaTagType.PCMCIA_CIS:
|
||||
sidecar.BlockMedia[0].PCMCIA = new PCMCIAType();
|
||||
sidecar.BlockMedia[0].PCMCIA.CIS = new DumpType();
|
||||
sidecar.BlockMedia[0].PCMCIA.CIS.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.PCMCIA_CIS)).ToArray();
|
||||
sidecar.BlockMedia[0].PCMCIA.CIS.Size = _imageFormat.ReadDiskTag(DiskTagType.PCMCIA_CIS).Length;
|
||||
sidecar.BlockMedia[0].PCMCIA.CIS.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.PCMCIA_CIS)).ToArray();
|
||||
sidecar.BlockMedia[0].PCMCIA.CIS.Size = _imageFormat.ReadDiskTag(MediaTagType.PCMCIA_CIS).Length;
|
||||
break;
|
||||
case DiskTagType.SCSI_INQUIRY:
|
||||
case MediaTagType.SCSI_INQUIRY:
|
||||
sidecar.BlockMedia[0].SCSI = new SCSIType();
|
||||
sidecar.BlockMedia[0].SCSI.Inquiry = new DumpType();
|
||||
sidecar.BlockMedia[0].SCSI.Inquiry.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.SCSI_INQUIRY)).ToArray();
|
||||
sidecar.BlockMedia[0].SCSI.Inquiry.Size = _imageFormat.ReadDiskTag(DiskTagType.SCSI_INQUIRY).Length;
|
||||
sidecar.BlockMedia[0].SCSI.Inquiry.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.SCSI_INQUIRY)).ToArray();
|
||||
sidecar.BlockMedia[0].SCSI.Inquiry.Size = _imageFormat.ReadDiskTag(MediaTagType.SCSI_INQUIRY).Length;
|
||||
break;
|
||||
case DiskTagType.SD_CID:
|
||||
case MediaTagType.SD_CID:
|
||||
if(sidecar.BlockMedia[0].SecureDigital == null)
|
||||
sidecar.BlockMedia[0].SecureDigital = new SecureDigitalType();
|
||||
sidecar.BlockMedia[0].SecureDigital.CID = new DumpType();
|
||||
sidecar.BlockMedia[0].SecureDigital.CID.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.SD_CID)).ToArray();
|
||||
sidecar.BlockMedia[0].SecureDigital.CID.Size = _imageFormat.ReadDiskTag(DiskTagType.SD_CID).Length;
|
||||
sidecar.BlockMedia[0].SecureDigital.CID.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.SD_CID)).ToArray();
|
||||
sidecar.BlockMedia[0].SecureDigital.CID.Size = _imageFormat.ReadDiskTag(MediaTagType.SD_CID).Length;
|
||||
break;
|
||||
case DiskTagType.SD_CSD:
|
||||
case MediaTagType.SD_CSD:
|
||||
if(sidecar.BlockMedia[0].SecureDigital == null)
|
||||
sidecar.BlockMedia[0].SecureDigital = new SecureDigitalType();
|
||||
sidecar.BlockMedia[0].SecureDigital.CSD = new DumpType();
|
||||
sidecar.BlockMedia[0].SecureDigital.CSD.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.SD_CSD)).ToArray();
|
||||
sidecar.BlockMedia[0].SecureDigital.CSD.Size = _imageFormat.ReadDiskTag(DiskTagType.SD_CSD).Length;
|
||||
sidecar.BlockMedia[0].SecureDigital.CSD.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.SD_CSD)).ToArray();
|
||||
sidecar.BlockMedia[0].SecureDigital.CSD.Size = _imageFormat.ReadDiskTag(MediaTagType.SD_CSD).Length;
|
||||
break;
|
||||
case DiskTagType.SD_ExtendedCSD:
|
||||
case MediaTagType.SD_ExtendedCSD:
|
||||
if(sidecar.BlockMedia[0].SecureDigital == null)
|
||||
sidecar.BlockMedia[0].SecureDigital = new SecureDigitalType();
|
||||
sidecar.BlockMedia[0].SecureDigital.ExtendedCSD = new DumpType();
|
||||
sidecar.BlockMedia[0].SecureDigital.ExtendedCSD.Checksums = GetChecksums(_imageFormat.ReadDiskTag(DiskTagType.SD_ExtendedCSD)).ToArray();
|
||||
sidecar.BlockMedia[0].SecureDigital.ExtendedCSD.Size = _imageFormat.ReadDiskTag(DiskTagType.SD_ExtendedCSD).Length;
|
||||
sidecar.BlockMedia[0].SecureDigital.ExtendedCSD.Checksums = GetChecksums(_imageFormat.ReadDiskTag(MediaTagType.SD_ExtendedCSD)).ToArray();
|
||||
sidecar.BlockMedia[0].SecureDigital.ExtendedCSD.Size = _imageFormat.ReadDiskTag(MediaTagType.SD_ExtendedCSD).Length;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
string dskType, dskSubType;
|
||||
Metadata.DiskType.DiskTypeToString(_imageFormat.ImageInfo.diskType, out dskType, out dskSubType);
|
||||
Metadata.MediaType.MediaTypeToString(_imageFormat.ImageInfo.mediaType, out dskType, out dskSubType);
|
||||
sidecar.BlockMedia[0].DiskType = dskType;
|
||||
sidecar.BlockMedia[0].DiskSubType = dskSubType;
|
||||
|
||||
sidecar.BlockMedia[0].Dimensions = Metadata.Dimensions.DimensionsFromDiskType(_imageFormat.ImageInfo.diskType);
|
||||
sidecar.BlockMedia[0].Dimensions = Metadata.Dimensions.DimensionsFromMediaType(_imageFormat.ImageInfo.mediaType);
|
||||
|
||||
sidecar.BlockMedia[0].LogicalBlocks = (long)_imageFormat.GetSectors();
|
||||
sidecar.BlockMedia[0].LogicalBlockSize = (int)_imageFormat.GetSectorSize();
|
||||
@@ -1257,7 +1257,7 @@ namespace DiscImageChef.Commands
|
||||
sidecar.LinearMedia[0].Image.Value = Path.GetFileName(options.InputFile);
|
||||
sidecar.LinearMedia[0].Size = fi.Length;
|
||||
|
||||
//DiskType dskType = _imageFormat.ImageInfo.diskType;
|
||||
//MediaType dskType = _imageFormat.ImageInfo.diskType;
|
||||
// TODO: Complete it
|
||||
break;
|
||||
}
|
||||
@@ -1273,10 +1273,10 @@ namespace DiscImageChef.Commands
|
||||
sidecar.AudioMedia[0].Image.Value = Path.GetFileName(options.InputFile);
|
||||
sidecar.AudioMedia[0].Size = fi.Length;
|
||||
sidecar.AudioMedia[0].Sequence = new SequenceType();
|
||||
if (_imageFormat.GetDiskSequence() != 0 && _imageFormat.GetLastDiskSequence() != 0)
|
||||
if (_imageFormat.GetMediaSequence() != 0 && _imageFormat.GetLastDiskSequence() != 0)
|
||||
{
|
||||
sidecar.AudioMedia[0].Sequence.MediaSequence = _imageFormat.GetDiskSequence();
|
||||
sidecar.AudioMedia[0].Sequence.TotalMedia = _imageFormat.GetDiskSequence();
|
||||
sidecar.AudioMedia[0].Sequence.MediaSequence = _imageFormat.GetMediaSequence();
|
||||
sidecar.AudioMedia[0].Sequence.TotalMedia = _imageFormat.GetMediaSequence();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1285,7 +1285,7 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
sidecar.AudioMedia[0].Sequence.MediaTitle = _imageFormat.GetImageName();
|
||||
|
||||
//DiskType dskType = _imageFormat.ImageInfo.diskType;
|
||||
//MediaType dskType = _imageFormat.ImageInfo.diskType;
|
||||
// TODO: Complete it
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -65,17 +65,17 @@ namespace DiscImageChef.Commands
|
||||
|
||||
if (options.DiskTags)
|
||||
{
|
||||
if (inputFormat.ImageInfo.readableDiskTags.Count == 0)
|
||||
if (inputFormat.ImageInfo.readableMediaTags.Count == 0)
|
||||
DicConsole.WriteLine("There are no disk tags in chosen disc image.");
|
||||
else
|
||||
{
|
||||
foreach (DiskTagType tag in inputFormat.ImageInfo.readableDiskTags)
|
||||
foreach (MediaTagType tag in inputFormat.ImageInfo.readableMediaTags)
|
||||
{
|
||||
switch (tag)
|
||||
{
|
||||
case DiskTagType.SCSI_INQUIRY:
|
||||
case MediaTagType.SCSI_INQUIRY:
|
||||
{
|
||||
byte[] inquiry = inputFormat.ReadDiskTag(DiskTagType.SCSI_INQUIRY);
|
||||
byte[] inquiry = inputFormat.ReadDiskTag(MediaTagType.SCSI_INQUIRY);
|
||||
if (inquiry == null)
|
||||
DicConsole.WriteLine("Error reading SCSI INQUIRY response from disc image");
|
||||
else
|
||||
@@ -87,9 +87,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.ATA_IDENTIFY:
|
||||
case MediaTagType.ATA_IDENTIFY:
|
||||
{
|
||||
byte[] identify = inputFormat.ReadDiskTag(DiskTagType.ATA_IDENTIFY);
|
||||
byte[] identify = inputFormat.ReadDiskTag(MediaTagType.ATA_IDENTIFY);
|
||||
if (identify == null)
|
||||
DicConsole.WriteLine("Error reading ATA IDENTIFY DEVICE response from disc image");
|
||||
else
|
||||
@@ -101,9 +101,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.ATAPI_IDENTIFY:
|
||||
case MediaTagType.ATAPI_IDENTIFY:
|
||||
{
|
||||
byte[] identify = inputFormat.ReadDiskTag(DiskTagType.ATAPI_IDENTIFY);
|
||||
byte[] identify = inputFormat.ReadDiskTag(MediaTagType.ATAPI_IDENTIFY);
|
||||
if (identify == null)
|
||||
DicConsole.WriteLine("Error reading ATA IDENTIFY PACKET DEVICE response from disc image");
|
||||
else
|
||||
@@ -115,9 +115,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.CD_ATIP:
|
||||
case MediaTagType.CD_ATIP:
|
||||
{
|
||||
byte[] atip = inputFormat.ReadDiskTag(DiskTagType.CD_ATIP);
|
||||
byte[] atip = inputFormat.ReadDiskTag(MediaTagType.CD_ATIP);
|
||||
if (atip == null)
|
||||
DicConsole.WriteLine("Error reading CD ATIP from disc image");
|
||||
else
|
||||
@@ -129,9 +129,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.CD_FullTOC:
|
||||
case MediaTagType.CD_FullTOC:
|
||||
{
|
||||
byte[] fulltoc = inputFormat.ReadDiskTag(DiskTagType.CD_FullTOC);
|
||||
byte[] fulltoc = inputFormat.ReadDiskTag(MediaTagType.CD_FullTOC);
|
||||
if (fulltoc == null)
|
||||
DicConsole.WriteLine("Error reading CD full TOC from disc image");
|
||||
else
|
||||
@@ -143,9 +143,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.CD_PMA:
|
||||
case MediaTagType.CD_PMA:
|
||||
{
|
||||
byte[] pma = inputFormat.ReadDiskTag(DiskTagType.CD_PMA);
|
||||
byte[] pma = inputFormat.ReadDiskTag(MediaTagType.CD_PMA);
|
||||
if (pma == null)
|
||||
DicConsole.WriteLine("Error reading CD PMA from disc image");
|
||||
else
|
||||
@@ -157,9 +157,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.CD_SessionInfo:
|
||||
case MediaTagType.CD_SessionInfo:
|
||||
{
|
||||
byte[] sessioninfo = inputFormat.ReadDiskTag(DiskTagType.CD_SessionInfo);
|
||||
byte[] sessioninfo = inputFormat.ReadDiskTag(MediaTagType.CD_SessionInfo);
|
||||
if (sessioninfo == null)
|
||||
DicConsole.WriteLine("Error reading CD session information from disc image");
|
||||
else
|
||||
@@ -171,9 +171,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.CD_TEXT:
|
||||
case MediaTagType.CD_TEXT:
|
||||
{
|
||||
byte[] cdtext = inputFormat.ReadDiskTag(DiskTagType.CD_TEXT);
|
||||
byte[] cdtext = inputFormat.ReadDiskTag(MediaTagType.CD_TEXT);
|
||||
if (cdtext == null)
|
||||
DicConsole.WriteLine("Error reading CD-TEXT from disc image");
|
||||
else
|
||||
@@ -185,9 +185,9 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
break;
|
||||
}
|
||||
case DiskTagType.CD_TOC:
|
||||
case MediaTagType.CD_TOC:
|
||||
{
|
||||
byte[] toc = inputFormat.ReadDiskTag(DiskTagType.CD_TOC);
|
||||
byte[] toc = inputFormat.ReadDiskTag(MediaTagType.CD_TOC);
|
||||
if (toc == null)
|
||||
DicConsole.WriteLine("Error reading CD TOC from disc image");
|
||||
else
|
||||
|
||||
@@ -109,7 +109,7 @@ namespace DiscImageChef.Commands
|
||||
byte[] senseBuf;
|
||||
bool sense;
|
||||
double duration;
|
||||
DiskType dskType = DiskType.Unknown;
|
||||
MediaType dskType = MediaType.Unknown;
|
||||
ulong blocks = 0;
|
||||
uint blockSize = 0;
|
||||
|
||||
@@ -292,91 +292,91 @@ namespace DiscImageChef.Commands
|
||||
switch (ftr.CurrentProfile)
|
||||
{
|
||||
case 0x0001:
|
||||
dskType = DiskType.GENERIC_HDD;
|
||||
dskType = MediaType.GENERIC_HDD;
|
||||
break;
|
||||
case 0x0005:
|
||||
dskType = DiskType.CDMO;
|
||||
dskType = MediaType.CDMO;
|
||||
break;
|
||||
case 0x0008:
|
||||
dskType = DiskType.CD;
|
||||
dskType = MediaType.CD;
|
||||
break;
|
||||
case 0x0009:
|
||||
dskType = DiskType.CDR;
|
||||
dskType = MediaType.CDR;
|
||||
break;
|
||||
case 0x000A:
|
||||
dskType = DiskType.CDRW;
|
||||
dskType = MediaType.CDRW;
|
||||
break;
|
||||
case 0x0010:
|
||||
dskType = DiskType.DVDROM;
|
||||
dskType = MediaType.DVDROM;
|
||||
break;
|
||||
case 0x0011:
|
||||
dskType = DiskType.DVDR;
|
||||
dskType = MediaType.DVDR;
|
||||
break;
|
||||
case 0x0012:
|
||||
dskType = DiskType.DVDRAM;
|
||||
dskType = MediaType.DVDRAM;
|
||||
break;
|
||||
case 0x0013:
|
||||
case 0x0014:
|
||||
dskType = DiskType.DVDRW;
|
||||
dskType = MediaType.DVDRW;
|
||||
break;
|
||||
case 0x0015:
|
||||
case 0x0016:
|
||||
dskType = DiskType.DVDRDL;
|
||||
dskType = MediaType.DVDRDL;
|
||||
break;
|
||||
case 0x0017:
|
||||
dskType = DiskType.DVDRWDL;
|
||||
dskType = MediaType.DVDRWDL;
|
||||
break;
|
||||
case 0x0018:
|
||||
dskType = DiskType.DVDDownload;
|
||||
dskType = MediaType.DVDDownload;
|
||||
break;
|
||||
case 0x001A:
|
||||
dskType = DiskType.DVDPRW;
|
||||
dskType = MediaType.DVDPRW;
|
||||
break;
|
||||
case 0x001B:
|
||||
dskType = DiskType.DVDPR;
|
||||
dskType = MediaType.DVDPR;
|
||||
break;
|
||||
case 0x0020:
|
||||
dskType = DiskType.DDCD;
|
||||
dskType = MediaType.DDCD;
|
||||
break;
|
||||
case 0x0021:
|
||||
dskType = DiskType.DDCDR;
|
||||
dskType = MediaType.DDCDR;
|
||||
break;
|
||||
case 0x0022:
|
||||
dskType = DiskType.DDCDRW;
|
||||
dskType = MediaType.DDCDRW;
|
||||
break;
|
||||
case 0x002A:
|
||||
dskType = DiskType.DVDPRWDL;
|
||||
dskType = MediaType.DVDPRWDL;
|
||||
break;
|
||||
case 0x002B:
|
||||
dskType = DiskType.DVDPRDL;
|
||||
dskType = MediaType.DVDPRDL;
|
||||
break;
|
||||
case 0x0040:
|
||||
dskType = DiskType.BDROM;
|
||||
dskType = MediaType.BDROM;
|
||||
break;
|
||||
case 0x0041:
|
||||
case 0x0042:
|
||||
dskType = DiskType.BDR;
|
||||
dskType = MediaType.BDR;
|
||||
break;
|
||||
case 0x0043:
|
||||
dskType = DiskType.BDRE;
|
||||
dskType = MediaType.BDRE;
|
||||
break;
|
||||
case 0x0050:
|
||||
dskType = DiskType.HDDVDROM;
|
||||
dskType = MediaType.HDDVDROM;
|
||||
break;
|
||||
case 0x0051:
|
||||
dskType = DiskType.HDDVDR;
|
||||
dskType = MediaType.HDDVDR;
|
||||
break;
|
||||
case 0x0052:
|
||||
dskType = DiskType.HDDVDRAM;
|
||||
dskType = MediaType.HDDVDRAM;
|
||||
break;
|
||||
case 0x0053:
|
||||
dskType = DiskType.HDDVDRW;
|
||||
dskType = MediaType.HDDVDRW;
|
||||
break;
|
||||
case 0x0058:
|
||||
dskType = DiskType.HDDVDRDL;
|
||||
dskType = MediaType.HDDVDRDL;
|
||||
break;
|
||||
case 0x005A:
|
||||
dskType = DiskType.HDDVDRWDL;
|
||||
dskType = MediaType.HDDVDRWDL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -402,15 +402,15 @@ namespace DiscImageChef.Commands
|
||||
*/
|
||||
|
||||
#region All DVD and HD DVD types
|
||||
if (dskType == DiskType.DVDDownload || dskType == DiskType.DVDPR ||
|
||||
dskType == DiskType.DVDPRDL || dskType == DiskType.DVDPRW ||
|
||||
dskType == DiskType.DVDPRWDL || dskType == DiskType.DVDR ||
|
||||
dskType == DiskType.DVDRAM || dskType == DiskType.DVDRDL ||
|
||||
dskType == DiskType.DVDROM || dskType == DiskType.DVDRW ||
|
||||
dskType == DiskType.DVDRWDL || dskType == DiskType.HDDVDR ||
|
||||
dskType == DiskType.HDDVDRAM || dskType == DiskType.HDDVDRDL ||
|
||||
dskType == DiskType.HDDVDROM || dskType == DiskType.HDDVDRW ||
|
||||
dskType == DiskType.HDDVDRWDL)
|
||||
if (dskType == MediaType.DVDDownload || dskType == MediaType.DVDPR ||
|
||||
dskType == MediaType.DVDPRDL || dskType == MediaType.DVDPRW ||
|
||||
dskType == MediaType.DVDPRWDL || dskType == MediaType.DVDR ||
|
||||
dskType == MediaType.DVDRAM || dskType == MediaType.DVDRDL ||
|
||||
dskType == MediaType.DVDROM || dskType == MediaType.DVDRW ||
|
||||
dskType == MediaType.DVDRWDL || dskType == MediaType.HDDVDR ||
|
||||
dskType == MediaType.HDDVDRAM || dskType == MediaType.HDDVDRDL ||
|
||||
dskType == MediaType.HDDVDROM || dskType == MediaType.HDDVDRW ||
|
||||
dskType == MediaType.HDDVDRWDL)
|
||||
{
|
||||
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out duration);
|
||||
@@ -433,7 +433,7 @@ namespace DiscImageChef.Commands
|
||||
if (Decoders.Xbox.DMI.IsXbox360(cmdBuf))
|
||||
{
|
||||
// TODO: Detect XGD3 from XGD2...
|
||||
dskType = DiskType.XGD2;
|
||||
dskType = MediaType.XGD2;
|
||||
DicConsole.WriteLine("Xbox 360 DMI:\n{0}", Decoders.Xbox.DMI.PrettifyXbox360(cmdBuf));
|
||||
}
|
||||
}
|
||||
@@ -441,7 +441,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion All DVD and HD DVD types
|
||||
|
||||
#region DVD-ROM
|
||||
if (dskType == DiskType.DVDDownload || dskType == DiskType.DVDROM)
|
||||
if (dskType == MediaType.DVDDownload || dskType == MediaType.DVDROM)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -455,8 +455,8 @@ namespace DiscImageChef.Commands
|
||||
#endregion DVD-ROM
|
||||
|
||||
#region DVD-ROM and HD DVD-ROM
|
||||
if (dskType == DiskType.DVDDownload || dskType == DiskType.DVDROM ||
|
||||
dskType == DiskType.HDDVDROM)
|
||||
if (dskType == MediaType.DVDDownload || dskType == MediaType.DVDROM ||
|
||||
dskType == MediaType.HDDVDROM)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -532,7 +532,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion Require drive authentication, won't work
|
||||
|
||||
#region DVD-RAM and HD DVD-RAM
|
||||
if (dskType == DiskType.DVDRAM || dskType == DiskType.HDDVDRAM)
|
||||
if (dskType == MediaType.DVDRAM || dskType == MediaType.HDDVDRAM)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDRAM_DDS, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -562,7 +562,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion DVD-RAM and HD DVD-RAM
|
||||
|
||||
#region DVD-R and HD DVD-R
|
||||
if (dskType == DiskType.DVDR || dskType == DiskType.HDDVDR)
|
||||
if (dskType == MediaType.DVDR || dskType == MediaType.HDDVDR)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.LastBorderOutRMD, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -573,7 +573,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion DVD-R and HD DVD-R
|
||||
|
||||
#region DVD-R and DVD-RW
|
||||
if (dskType == DiskType.DVDR || dskType == DiskType.DVDRW)
|
||||
if (dskType == MediaType.DVDR || dskType == MediaType.DVDRW)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -584,7 +584,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion DVD-R and DVD-RW
|
||||
|
||||
#region DVD-R, DVD-RW and HD DVD-R
|
||||
if (dskType == DiskType.DVDR || dskType == DiskType.DVDRW || dskType == DiskType.HDDVDR)
|
||||
if (dskType == MediaType.DVDR || dskType == MediaType.DVDRW || dskType == MediaType.HDDVDR)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_MediaIdentifier, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -600,8 +600,8 @@ namespace DiscImageChef.Commands
|
||||
#endregion DVD-R, DVD-RW and HD DVD-R
|
||||
|
||||
#region All DVD+
|
||||
if (dskType == DiskType.DVDPR || dskType == DiskType.DVDPRDL ||
|
||||
dskType == DiskType.DVDPRW || dskType == DiskType.DVDPRWDL)
|
||||
if (dskType == MediaType.DVDPR || dskType == MediaType.DVDPRDL ||
|
||||
dskType == MediaType.DVDPRW || dskType == MediaType.DVDPRWDL)
|
||||
{
|
||||
// TODO: None of my test discs return an ADIP. Also, it just seems to contain pre-recorded PFI, and drive is returning it on blank media using standard PFI command
|
||||
/*
|
||||
@@ -621,7 +621,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion All DVD+
|
||||
|
||||
#region HD DVD-ROM
|
||||
if (dskType == DiskType.HDDVDROM)
|
||||
if (dskType == MediaType.HDDVDROM)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.HDDVD_CopyrightInformation, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -632,7 +632,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion HD DVD-ROM
|
||||
|
||||
#region HD DVD-R
|
||||
if (dskType == DiskType.HDDVDR)
|
||||
if (dskType == MediaType.HDDVDR)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.HDDVDR_MediumStatus, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -648,8 +648,8 @@ namespace DiscImageChef.Commands
|
||||
#endregion HD DVD-R
|
||||
|
||||
#region DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL
|
||||
if (dskType == DiskType.DVDPRDL || dskType == DiskType.DVDRDL ||
|
||||
dskType == DiskType.DVDRWDL || dskType == DiskType.DVDPRWDL)
|
||||
if (dskType == MediaType.DVDPRDL || dskType == MediaType.DVDRDL ||
|
||||
dskType == MediaType.DVDRWDL || dskType == MediaType.DVDPRWDL)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_LayerCapacity, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -660,7 +660,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL
|
||||
|
||||
#region DVD-R DL
|
||||
if (dskType == DiskType.DVDRDL)
|
||||
if (dskType == MediaType.DVDRDL)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -686,8 +686,8 @@ namespace DiscImageChef.Commands
|
||||
#endregion DVD-R DL
|
||||
|
||||
#region All Blu-ray
|
||||
if (dskType == DiskType.BDR || dskType == DiskType.BDRE || dskType == DiskType.BDROM ||
|
||||
dskType == DiskType.BDRXL || dskType == DiskType.BDREXL)
|
||||
if (dskType == MediaType.BDR || dskType == MediaType.BDRE || dskType == MediaType.BDROM ||
|
||||
dskType == MediaType.BDRXL || dskType == MediaType.BDREXL)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -706,7 +706,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion All Blu-ray
|
||||
|
||||
#region BD-ROM only
|
||||
if (dskType == DiskType.BDROM)
|
||||
if (dskType == MediaType.BDROM)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.BD_BurstCuttingArea, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -720,8 +720,8 @@ namespace DiscImageChef.Commands
|
||||
#endregion BD-ROM only
|
||||
|
||||
#region Writable Blu-ray only
|
||||
if (dskType == DiskType.BDR || dskType == DiskType.BDRE ||
|
||||
dskType == DiskType.BDRXL || dskType == DiskType.BDREXL)
|
||||
if (dskType == MediaType.BDR || dskType == MediaType.BDRE ||
|
||||
dskType == MediaType.BDRXL || dskType == MediaType.BDREXL)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.BD_DDS, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -772,11 +772,11 @@ namespace DiscImageChef.Commands
|
||||
#endregion Writable Blu-ray only
|
||||
|
||||
#region CDs
|
||||
if (dskType == DiskType.CD ||
|
||||
dskType == DiskType.CDR ||
|
||||
dskType == DiskType.CDROM ||
|
||||
dskType == DiskType.CDRW ||
|
||||
dskType == DiskType.Unknown)
|
||||
if (dskType == MediaType.CD ||
|
||||
dskType == MediaType.CDR ||
|
||||
dskType == MediaType.CDROM ||
|
||||
dskType == MediaType.CDRW ||
|
||||
dskType == MediaType.Unknown)
|
||||
{
|
||||
Decoders.CD.TOC.CDTOC? toc = null;
|
||||
|
||||
@@ -792,8 +792,8 @@ namespace DiscImageChef.Commands
|
||||
doWriteFile(outputPrefix, "_toc.bin", "SCSI READ TOC/PMA/ATIP", cmdBuf);
|
||||
|
||||
// As we have a TOC we know it is a CD
|
||||
if (dskType == DiskType.Unknown)
|
||||
dskType = DiskType.CD;
|
||||
if (dskType == MediaType.Unknown)
|
||||
dskType = MediaType.CD;
|
||||
}
|
||||
|
||||
// ATIP exists on blank CDs
|
||||
@@ -808,7 +808,7 @@ namespace DiscImageChef.Commands
|
||||
{
|
||||
DicConsole.WriteLine("ATIP:\n{0}", Decoders.CD.ATIP.Prettify(atip));
|
||||
// Only CD-R and CD-RW have ATIP
|
||||
dskType = atip.Value.DiscType ? DiskType.CDRW : DiskType.CDR;
|
||||
dskType = atip.Value.DiscType ? MediaType.CDRW : MediaType.CDR;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -827,15 +827,15 @@ namespace DiscImageChef.Commands
|
||||
doWriteFile(outputPrefix, "_readdiscinformation_000b.bin", "SCSI READ DISC INFORMATION", cmdBuf);
|
||||
|
||||
// If it is a read-only CD, check CD type if available
|
||||
if (dskType == DiskType.CD)
|
||||
if (dskType == MediaType.CD)
|
||||
{
|
||||
switch (discInfo.Value.DiscType)
|
||||
{
|
||||
case 0x10:
|
||||
dskType = DiskType.CDI;
|
||||
dskType = MediaType.CDI;
|
||||
break;
|
||||
case 0x20:
|
||||
dskType = DiskType.CDROMXA;
|
||||
dskType = MediaType.CDROMXA;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -860,7 +860,7 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
}
|
||||
|
||||
if (dskType == DiskType.CD)
|
||||
if (dskType == MediaType.CD)
|
||||
{
|
||||
bool hasDataTrack = false;
|
||||
bool hasAudioTrack = false;
|
||||
@@ -893,13 +893,13 @@ namespace DiscImageChef.Commands
|
||||
}
|
||||
|
||||
if (hasDataTrack && hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2)
|
||||
dskType = DiskType.CDPLUS;
|
||||
dskType = MediaType.CDPLUS;
|
||||
if (!hasDataTrack && hasAudioTrack && sessions == 1)
|
||||
dskType = DiskType.CDDA;
|
||||
dskType = MediaType.CDDA;
|
||||
if (hasDataTrack && !hasAudioTrack && sessions == 1)
|
||||
dskType = DiskType.CDROM;
|
||||
dskType = MediaType.CDROM;
|
||||
if (hasVideoTrack && !hasDataTrack && sessions == 1)
|
||||
dskType = DiskType.CDV;
|
||||
dskType = MediaType.CDV;
|
||||
}
|
||||
|
||||
sense = dev.ReadRawToc(out cmdBuf, out senseBuf, 1, dev.Timeout, out duration);
|
||||
@@ -933,7 +933,7 @@ namespace DiscImageChef.Commands
|
||||
#endregion CDs
|
||||
|
||||
#region Nintendo
|
||||
if (dskType == DiskType.Unknown && blocks > 0)
|
||||
if (dskType == MediaType.Unknown && blocks > 0)
|
||||
{
|
||||
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out duration);
|
||||
if (sense)
|
||||
@@ -949,9 +949,9 @@ namespace DiscImageChef.Commands
|
||||
nintendoPfi.Value.PartVersion == 15)
|
||||
{
|
||||
if (nintendoPfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.Eighty)
|
||||
dskType = DiskType.GOD;
|
||||
dskType = MediaType.GOD;
|
||||
else if (nintendoPfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.OneTwenty)
|
||||
dskType = DiskType.WOD;
|
||||
dskType = MediaType.WOD;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ namespace DiscImageChef.Commands
|
||||
if (options.VerifyDisc)
|
||||
{
|
||||
DateTime StartCheck = DateTime.UtcNow;
|
||||
bool? discCheckStatus = inputFormat.VerifyDiskImage();
|
||||
bool? discCheckStatus = inputFormat.VerifyMediaImage();
|
||||
DateTime EndCheck = DateTime.UtcNow;
|
||||
|
||||
TimeSpan CheckTime = EndCheck - StartCheck;
|
||||
|
||||
Reference in New Issue
Block a user