mirror of
https://github.com/aaru-dps/Aaru.Server.git
synced 2025-12-16 19:24:27 +00:00
REFACTOR: Remove unneeded code.
This commit is contained in:
@@ -30,6 +30,7 @@
|
||||
// Copyright © 2011-2018 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using DiscImageChef.DiscImages;
|
||||
@@ -40,7 +41,7 @@ namespace DiscImageChef.Core
|
||||
public static partial class Sidecar
|
||||
{
|
||||
// TODO: Complete it
|
||||
static void AudioMedia(ImagePlugin image, System.Guid filterId, string imagePath, FileInfo fi,
|
||||
static void AudioMedia(ImagePlugin image, Guid filterId, string imagePath, FileInfo fi,
|
||||
PluginBase plugins, List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar)
|
||||
{
|
||||
sidecar.AudioMedia = new[]
|
||||
|
||||
@@ -36,18 +36,21 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using DiscImageChef.CommonTypes;
|
||||
using DiscImageChef.Console;
|
||||
using DiscImageChef.Decoders.ATA;
|
||||
using DiscImageChef.Decoders.PCMCIA;
|
||||
using DiscImageChef.DiscImages;
|
||||
using DiscImageChef.Filesystems;
|
||||
using DiscImageChef.Filters;
|
||||
using DiscImageChef.DiscImages;
|
||||
using DiscImageChef.Metadata;
|
||||
using Schemas;
|
||||
using MediaType = DiscImageChef.Metadata.MediaType;
|
||||
using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple;
|
||||
|
||||
namespace DiscImageChef.Core
|
||||
{
|
||||
public static partial class Sidecar
|
||||
{
|
||||
static void BlockMedia(ImagePlugin image, System.Guid filterId, string imagePath, FileInfo fi,
|
||||
static void BlockMedia(ImagePlugin image, Guid filterId, string imagePath, FileInfo fi,
|
||||
PluginBase plugins, List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar)
|
||||
{
|
||||
sidecar.BlockMedia = new[]
|
||||
@@ -227,8 +230,8 @@ namespace DiscImageChef.Core
|
||||
}
|
||||
|
||||
// If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
|
||||
if(image.PluginUuid == new System.Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
|
||||
filterId == new System.Guid("12345678-AAAA-BBBB-CCCC-123456789000")) sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums;
|
||||
if(image.PluginUuid == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
|
||||
filterId == new Guid("12345678-AAAA-BBBB-CCCC-123456789000")) sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums;
|
||||
else
|
||||
{
|
||||
Checksum contentChkWorker = new Checksum();
|
||||
@@ -271,12 +274,12 @@ namespace DiscImageChef.Core
|
||||
EndProgress2();
|
||||
}
|
||||
|
||||
Metadata.MediaType.MediaTypeToString(image.ImageInfo.MediaType, out string dskType, out string dskSubType);
|
||||
MediaType.MediaTypeToString(image.ImageInfo.MediaType, out string dskType, out string dskSubType);
|
||||
sidecar.BlockMedia[0].DiskType = dskType;
|
||||
sidecar.BlockMedia[0].DiskSubType = dskSubType;
|
||||
Statistics.AddMedia(image.ImageInfo.MediaType, false);
|
||||
|
||||
sidecar.BlockMedia[0].Dimensions = Metadata.Dimensions.DimensionsFromMediaType(image.ImageInfo.MediaType);
|
||||
sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(image.ImageInfo.MediaType);
|
||||
|
||||
sidecar.BlockMedia[0].LogicalBlocks = (long)image.GetSectors();
|
||||
sidecar.BlockMedia[0].LogicalBlockSize = (int)image.GetSectorSize();
|
||||
@@ -369,8 +372,8 @@ namespace DiscImageChef.Core
|
||||
|
||||
if(image.ImageInfo.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
|
||||
{
|
||||
Decoders.ATA.Identify.IdentifyDevice? ataId =
|
||||
Decoders.ATA.Identify.Decode(image.ReadDiskTag(MediaTagType.ATA_IDENTIFY));
|
||||
Identify.IdentifyDevice? ataId =
|
||||
Identify.Decode(image.ReadDiskTag(MediaTagType.ATA_IDENTIFY));
|
||||
if(ataId.HasValue)
|
||||
if(ataId.Value.CurrentCylinders > 0 && ataId.Value.CurrentHeads > 0 &&
|
||||
ataId.Value.CurrentSectorsPerTrack > 0)
|
||||
@@ -398,114 +401,114 @@ namespace DiscImageChef.Core
|
||||
|
||||
switch(image.ImageInfo.MediaType)
|
||||
{
|
||||
case MediaType.Apple32SS:
|
||||
case MediaType.Apple32DS:
|
||||
case CommonTypes.MediaType.Apple32SS:
|
||||
case CommonTypes.MediaType.Apple32DS:
|
||||
trkFormat = "Apple GCR (DOS 3.2)";
|
||||
break;
|
||||
case MediaType.Apple33SS:
|
||||
case MediaType.Apple33DS:
|
||||
case CommonTypes.MediaType.Apple33SS:
|
||||
case CommonTypes.MediaType.Apple33DS:
|
||||
trkFormat = "Apple GCR (DOS 3.3)";
|
||||
break;
|
||||
case MediaType.AppleSonySS:
|
||||
case MediaType.AppleSonyDS:
|
||||
case CommonTypes.MediaType.AppleSonySS:
|
||||
case CommonTypes.MediaType.AppleSonyDS:
|
||||
trkFormat = "Apple GCR (Sony)";
|
||||
break;
|
||||
case MediaType.AppleFileWare:
|
||||
case CommonTypes.MediaType.AppleFileWare:
|
||||
trkFormat = "Apple GCR (Twiggy)";
|
||||
break;
|
||||
case MediaType.DOS_525_SS_DD_9:
|
||||
case MediaType.DOS_525_DS_DD_8:
|
||||
case MediaType.DOS_525_DS_DD_9:
|
||||
case MediaType.DOS_525_HD:
|
||||
case MediaType.DOS_35_SS_DD_8:
|
||||
case MediaType.DOS_35_SS_DD_9:
|
||||
case MediaType.DOS_35_DS_DD_8:
|
||||
case MediaType.DOS_35_DS_DD_9:
|
||||
case MediaType.DOS_35_HD:
|
||||
case MediaType.DOS_35_ED:
|
||||
case MediaType.DMF:
|
||||
case MediaType.DMF_82:
|
||||
case MediaType.XDF_525:
|
||||
case MediaType.XDF_35:
|
||||
case MediaType.IBM53FD_256:
|
||||
case MediaType.IBM53FD_512:
|
||||
case MediaType.IBM53FD_1024:
|
||||
case MediaType.RX02:
|
||||
case MediaType.RX03:
|
||||
case MediaType.RX50:
|
||||
case MediaType.ACORN_525_SS_DD_40:
|
||||
case MediaType.ACORN_525_SS_DD_80:
|
||||
case MediaType.ACORN_525_DS_DD:
|
||||
case MediaType.ACORN_35_DS_DD:
|
||||
case MediaType.ACORN_35_DS_HD:
|
||||
case MediaType.ATARI_525_ED:
|
||||
case MediaType.ATARI_525_DD:
|
||||
case MediaType.ATARI_35_SS_DD:
|
||||
case MediaType.ATARI_35_DS_DD:
|
||||
case MediaType.ATARI_35_SS_DD_11:
|
||||
case MediaType.ATARI_35_DS_DD_11:
|
||||
case MediaType.DOS_525_SS_DD_8:
|
||||
case MediaType.NEC_8_DD:
|
||||
case MediaType.NEC_525_SS:
|
||||
case MediaType.NEC_525_DS:
|
||||
case MediaType.NEC_525_HD:
|
||||
case MediaType.NEC_35_HD_8:
|
||||
case MediaType.NEC_35_HD_15:
|
||||
case MediaType.NEC_35_TD:
|
||||
case MediaType.FDFORMAT_525_DD:
|
||||
case MediaType.FDFORMAT_525_HD:
|
||||
case MediaType.FDFORMAT_35_DD:
|
||||
case MediaType.FDFORMAT_35_HD:
|
||||
case MediaType.Apricot_35:
|
||||
case MediaType.CompactFloppy:
|
||||
case CommonTypes.MediaType.DOS_525_SS_DD_9:
|
||||
case CommonTypes.MediaType.DOS_525_DS_DD_8:
|
||||
case CommonTypes.MediaType.DOS_525_DS_DD_9:
|
||||
case CommonTypes.MediaType.DOS_525_HD:
|
||||
case CommonTypes.MediaType.DOS_35_SS_DD_8:
|
||||
case CommonTypes.MediaType.DOS_35_SS_DD_9:
|
||||
case CommonTypes.MediaType.DOS_35_DS_DD_8:
|
||||
case CommonTypes.MediaType.DOS_35_DS_DD_9:
|
||||
case CommonTypes.MediaType.DOS_35_HD:
|
||||
case CommonTypes.MediaType.DOS_35_ED:
|
||||
case CommonTypes.MediaType.DMF:
|
||||
case CommonTypes.MediaType.DMF_82:
|
||||
case CommonTypes.MediaType.XDF_525:
|
||||
case CommonTypes.MediaType.XDF_35:
|
||||
case CommonTypes.MediaType.IBM53FD_256:
|
||||
case CommonTypes.MediaType.IBM53FD_512:
|
||||
case CommonTypes.MediaType.IBM53FD_1024:
|
||||
case CommonTypes.MediaType.RX02:
|
||||
case CommonTypes.MediaType.RX03:
|
||||
case CommonTypes.MediaType.RX50:
|
||||
case CommonTypes.MediaType.ACORN_525_SS_DD_40:
|
||||
case CommonTypes.MediaType.ACORN_525_SS_DD_80:
|
||||
case CommonTypes.MediaType.ACORN_525_DS_DD:
|
||||
case CommonTypes.MediaType.ACORN_35_DS_DD:
|
||||
case CommonTypes.MediaType.ACORN_35_DS_HD:
|
||||
case CommonTypes.MediaType.ATARI_525_ED:
|
||||
case CommonTypes.MediaType.ATARI_525_DD:
|
||||
case CommonTypes.MediaType.ATARI_35_SS_DD:
|
||||
case CommonTypes.MediaType.ATARI_35_DS_DD:
|
||||
case CommonTypes.MediaType.ATARI_35_SS_DD_11:
|
||||
case CommonTypes.MediaType.ATARI_35_DS_DD_11:
|
||||
case CommonTypes.MediaType.DOS_525_SS_DD_8:
|
||||
case CommonTypes.MediaType.NEC_8_DD:
|
||||
case CommonTypes.MediaType.NEC_525_SS:
|
||||
case CommonTypes.MediaType.NEC_525_DS:
|
||||
case CommonTypes.MediaType.NEC_525_HD:
|
||||
case CommonTypes.MediaType.NEC_35_HD_8:
|
||||
case CommonTypes.MediaType.NEC_35_HD_15:
|
||||
case CommonTypes.MediaType.NEC_35_TD:
|
||||
case CommonTypes.MediaType.FDFORMAT_525_DD:
|
||||
case CommonTypes.MediaType.FDFORMAT_525_HD:
|
||||
case CommonTypes.MediaType.FDFORMAT_35_DD:
|
||||
case CommonTypes.MediaType.FDFORMAT_35_HD:
|
||||
case CommonTypes.MediaType.Apricot_35:
|
||||
case CommonTypes.MediaType.CompactFloppy:
|
||||
trkFormat = "IBM MFM";
|
||||
break;
|
||||
case MediaType.ATARI_525_SD:
|
||||
case MediaType.NEC_8_SD:
|
||||
case MediaType.ACORN_525_SS_SD_40:
|
||||
case MediaType.ACORN_525_SS_SD_80:
|
||||
case MediaType.RX01:
|
||||
case MediaType.IBM23FD:
|
||||
case MediaType.IBM33FD_128:
|
||||
case MediaType.IBM33FD_256:
|
||||
case MediaType.IBM33FD_512:
|
||||
case MediaType.IBM43FD_128:
|
||||
case MediaType.IBM43FD_256:
|
||||
case CommonTypes.MediaType.ATARI_525_SD:
|
||||
case CommonTypes.MediaType.NEC_8_SD:
|
||||
case CommonTypes.MediaType.ACORN_525_SS_SD_40:
|
||||
case CommonTypes.MediaType.ACORN_525_SS_SD_80:
|
||||
case CommonTypes.MediaType.RX01:
|
||||
case CommonTypes.MediaType.IBM23FD:
|
||||
case CommonTypes.MediaType.IBM33FD_128:
|
||||
case CommonTypes.MediaType.IBM33FD_256:
|
||||
case CommonTypes.MediaType.IBM33FD_512:
|
||||
case CommonTypes.MediaType.IBM43FD_128:
|
||||
case CommonTypes.MediaType.IBM43FD_256:
|
||||
trkFormat = "IBM FM";
|
||||
break;
|
||||
case MediaType.CBM_35_DD:
|
||||
case CommonTypes.MediaType.CBM_35_DD:
|
||||
trkFormat = "Commodore MFM";
|
||||
break;
|
||||
case MediaType.CBM_AMIGA_35_HD:
|
||||
case MediaType.CBM_AMIGA_35_DD:
|
||||
case CommonTypes.MediaType.CBM_AMIGA_35_HD:
|
||||
case CommonTypes.MediaType.CBM_AMIGA_35_DD:
|
||||
trkFormat = "Amiga MFM";
|
||||
break;
|
||||
case MediaType.CBM_1540:
|
||||
case MediaType.CBM_1540_Ext:
|
||||
case MediaType.CBM_1571:
|
||||
case CommonTypes.MediaType.CBM_1540:
|
||||
case CommonTypes.MediaType.CBM_1540_Ext:
|
||||
case CommonTypes.MediaType.CBM_1571:
|
||||
trkFormat = "Commodore GCR";
|
||||
break;
|
||||
case MediaType.SHARP_525:
|
||||
case MediaType.SHARP_525_9:
|
||||
case MediaType.SHARP_35: break;
|
||||
case MediaType.SHARP_35_9: break;
|
||||
case MediaType.ECMA_99_15:
|
||||
case MediaType.ECMA_99_26:
|
||||
case MediaType.ECMA_100:
|
||||
case MediaType.ECMA_125:
|
||||
case MediaType.ECMA_147:
|
||||
case MediaType.ECMA_99_8:
|
||||
case CommonTypes.MediaType.SHARP_525:
|
||||
case CommonTypes.MediaType.SHARP_525_9:
|
||||
case CommonTypes.MediaType.SHARP_35: break;
|
||||
case CommonTypes.MediaType.SHARP_35_9: break;
|
||||
case CommonTypes.MediaType.ECMA_99_15:
|
||||
case CommonTypes.MediaType.ECMA_99_26:
|
||||
case CommonTypes.MediaType.ECMA_100:
|
||||
case CommonTypes.MediaType.ECMA_125:
|
||||
case CommonTypes.MediaType.ECMA_147:
|
||||
case CommonTypes.MediaType.ECMA_99_8:
|
||||
trkFormat = "ISO MFM";
|
||||
break;
|
||||
case MediaType.ECMA_54:
|
||||
case MediaType.ECMA_59:
|
||||
case MediaType.ECMA_66:
|
||||
case MediaType.ECMA_69_8:
|
||||
case MediaType.ECMA_69_15:
|
||||
case MediaType.ECMA_69_26:
|
||||
case MediaType.ECMA_70:
|
||||
case MediaType.ECMA_78:
|
||||
case MediaType.ECMA_78_2:
|
||||
case CommonTypes.MediaType.ECMA_54:
|
||||
case CommonTypes.MediaType.ECMA_59:
|
||||
case CommonTypes.MediaType.ECMA_66:
|
||||
case CommonTypes.MediaType.ECMA_69_8:
|
||||
case CommonTypes.MediaType.ECMA_69_15:
|
||||
case CommonTypes.MediaType.ECMA_69_26:
|
||||
case CommonTypes.MediaType.ECMA_70:
|
||||
case CommonTypes.MediaType.ECMA_78:
|
||||
case CommonTypes.MediaType.ECMA_78_2:
|
||||
trkFormat = "ISO FM";
|
||||
break;
|
||||
default:
|
||||
@@ -519,8 +522,8 @@ namespace DiscImageChef.Core
|
||||
|
||||
if(File.Exists(scpFilePath))
|
||||
{
|
||||
DiscImages.SuperCardPro scpImage = new SuperCardPro();
|
||||
Filters.ZZZNoFilter scpFilter = new ZZZNoFilter();
|
||||
SuperCardPro scpImage = new SuperCardPro();
|
||||
ZZZNoFilter scpFilter = new ZZZNoFilter();
|
||||
scpFilter.Open(scpFilePath);
|
||||
|
||||
if(image.ImageInfo.Heads <= 2 && scpImage.IdentifyImage(scpFilter))
|
||||
@@ -606,8 +609,8 @@ namespace DiscImageChef.Core
|
||||
|
||||
if(kfFile != null)
|
||||
{
|
||||
DiscImages.KryoFlux kfImage = new KryoFlux();
|
||||
Filters.ZZZNoFilter kfFilter = new ZZZNoFilter();
|
||||
KryoFlux kfImage = new KryoFlux();
|
||||
ZZZNoFilter kfFilter = new ZZZNoFilter();
|
||||
kfFilter.Open(kfFile);
|
||||
if(image.ImageInfo.Heads <= 2 && kfImage.IdentifyImage(kfFilter))
|
||||
{
|
||||
@@ -676,8 +679,8 @@ namespace DiscImageChef.Core
|
||||
|
||||
if(!File.Exists(dfiFilePath)) return;
|
||||
|
||||
DiscImages.DiscFerret dfiImage = new DiscFerret();
|
||||
Filters.ZZZNoFilter dfiFilter = new ZZZNoFilter();
|
||||
DiscFerret dfiImage = new DiscFerret();
|
||||
ZZZNoFilter dfiFilter = new ZZZNoFilter();
|
||||
dfiFilter.Open(dfiFilePath);
|
||||
|
||||
if(!dfiImage.IdentifyImage(dfiFilter)) return;
|
||||
|
||||
@@ -48,8 +48,8 @@ namespace DiscImageChef.Core
|
||||
{
|
||||
Image = new ImageType {format = "Directory", offsetSpecified = false, Value = folderName},
|
||||
Sequence = new SequenceType {MediaTitle = folderName, MediaSequence = 1, TotalMedia = 1},
|
||||
PhysicalBlockSize = (int)blockSize,
|
||||
LogicalBlockSize = (int)blockSize,
|
||||
PhysicalBlockSize = blockSize,
|
||||
LogicalBlockSize = blockSize,
|
||||
TapeInformation = new[]
|
||||
{
|
||||
new TapePartitionType
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
// Copyright © 2011-2018 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using DiscImageChef.DiscImages;
|
||||
@@ -40,7 +41,7 @@ namespace DiscImageChef.Core
|
||||
public static partial class Sidecar
|
||||
{
|
||||
// TODO: Complete it
|
||||
static void LinearMedia(ImagePlugin image, System.Guid filterId, string imagePath, FileInfo fi,
|
||||
static void LinearMedia(ImagePlugin image, Guid filterId, string imagePath, FileInfo fi,
|
||||
PluginBase plugins, List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar)
|
||||
{
|
||||
sidecar.LinearMedia = new[]
|
||||
|
||||
@@ -30,18 +30,24 @@
|
||||
// Copyright © 2011-2018 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using DiscImageChef.CommonTypes;
|
||||
using DiscImageChef.Filesystems;
|
||||
using DiscImageChef.Decoders.CD;
|
||||
using DiscImageChef.Decoders.DVD;
|
||||
using DiscImageChef.DiscImages;
|
||||
using DiscImageChef.Filesystems;
|
||||
using Schemas;
|
||||
using DMI = DiscImageChef.Decoders.Xbox.DMI;
|
||||
using Session = DiscImageChef.DiscImages.Session;
|
||||
using TrackType = Schemas.TrackType;
|
||||
|
||||
namespace DiscImageChef.Core
|
||||
{
|
||||
public static partial class Sidecar
|
||||
{
|
||||
static void OpticalDisc(ImagePlugin image, System.Guid filterId, string imagePath, FileInfo fi,
|
||||
static void OpticalDisc(ImagePlugin image, Guid filterId, string imagePath, FileInfo fi,
|
||||
PluginBase plugins, List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar)
|
||||
{
|
||||
sidecar.OpticalDisc = new[]
|
||||
@@ -83,8 +89,8 @@ namespace DiscImageChef.Core
|
||||
Checksums = Checksum.GetChecksums(image.ReadDiskTag(MediaTagType.CD_ATIP)).ToArray(),
|
||||
Size = image.ReadDiskTag(MediaTagType.CD_ATIP).Length
|
||||
};
|
||||
Decoders.CD.ATIP.CDATIP?
|
||||
atip = Decoders.CD.ATIP.Decode(image.ReadDiskTag(MediaTagType.CD_ATIP));
|
||||
ATIP.CDATIP?
|
||||
atip = ATIP.Decode(image.ReadDiskTag(MediaTagType.CD_ATIP));
|
||||
if(atip.HasValue)
|
||||
if(atip.Value.DDCD) dskType = atip.Value.DiscType ? MediaType.DDCDRW : MediaType.DDCDR;
|
||||
else dskType = atip.Value.DiscType ? MediaType.CDRW : MediaType.CDR;
|
||||
@@ -109,18 +115,18 @@ namespace DiscImageChef.Core
|
||||
Checksums = Checksum.GetChecksums(image.ReadDiskTag(MediaTagType.DVD_CMI)).ToArray(),
|
||||
Size = image.ReadDiskTag(MediaTagType.DVD_CMI).Length
|
||||
};
|
||||
Decoders.DVD.CSS_CPRM.LeadInCopyright? cmi =
|
||||
Decoders.DVD.CSS_CPRM.DecodeLeadInCopyright(image.ReadDiskTag(MediaTagType.DVD_CMI));
|
||||
CSS_CPRM.LeadInCopyright? cmi =
|
||||
CSS_CPRM.DecodeLeadInCopyright(image.ReadDiskTag(MediaTagType.DVD_CMI));
|
||||
if(cmi.HasValue)
|
||||
switch(cmi.Value.CopyrightType)
|
||||
{
|
||||
case Decoders.DVD.CopyrightType.AACS:
|
||||
case CopyrightType.AACS:
|
||||
sidecar.OpticalDisc[0].CopyProtection = "AACS";
|
||||
break;
|
||||
case Decoders.DVD.CopyrightType.CSS:
|
||||
case CopyrightType.CSS:
|
||||
sidecar.OpticalDisc[0].CopyProtection = "CSS";
|
||||
break;
|
||||
case Decoders.DVD.CopyrightType.CPRM:
|
||||
case CopyrightType.CPRM:
|
||||
sidecar.OpticalDisc[0].CopyProtection = "CPRM";
|
||||
break;
|
||||
}
|
||||
@@ -132,12 +138,12 @@ namespace DiscImageChef.Core
|
||||
Checksums = Checksum.GetChecksums(image.ReadDiskTag(MediaTagType.DVD_DMI)).ToArray(),
|
||||
Size = image.ReadDiskTag(MediaTagType.DVD_DMI).Length
|
||||
};
|
||||
if(Decoders.Xbox.DMI.IsXbox(image.ReadDiskTag(MediaTagType.DVD_DMI)))
|
||||
if(DMI.IsXbox(image.ReadDiskTag(MediaTagType.DVD_DMI)))
|
||||
{
|
||||
dskType = MediaType.XGD;
|
||||
sidecar.OpticalDisc[0].Dimensions = new DimensionsType {Diameter = 120};
|
||||
}
|
||||
else if(Decoders.Xbox.DMI.IsXbox360(image.ReadDiskTag(MediaTagType.DVD_DMI)))
|
||||
else if(DMI.IsXbox360(image.ReadDiskTag(MediaTagType.DVD_DMI)))
|
||||
{
|
||||
dskType = MediaType.XGD2;
|
||||
sidecar.OpticalDisc[0].Dimensions = new DimensionsType {Diameter = 120};
|
||||
@@ -149,53 +155,53 @@ namespace DiscImageChef.Core
|
||||
Checksums = Checksum.GetChecksums(image.ReadDiskTag(MediaTagType.DVD_PFI)).ToArray(),
|
||||
Size = image.ReadDiskTag(MediaTagType.DVD_PFI).Length
|
||||
};
|
||||
Decoders.DVD.PFI.PhysicalFormatInformation? pfi =
|
||||
Decoders.DVD.PFI.Decode(image.ReadDiskTag(MediaTagType.DVD_PFI));
|
||||
PFI.PhysicalFormatInformation? pfi =
|
||||
PFI.Decode(image.ReadDiskTag(MediaTagType.DVD_PFI));
|
||||
if(pfi.HasValue)
|
||||
if(dskType != MediaType.XGD && dskType != MediaType.XGD2 && dskType != MediaType.XGD3)
|
||||
{
|
||||
switch(pfi.Value.DiskCategory)
|
||||
{
|
||||
case Decoders.DVD.DiskCategory.DVDPR:
|
||||
case DiskCategory.DVDPR:
|
||||
dskType = MediaType.DVDPR;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDPRDL:
|
||||
case DiskCategory.DVDPRDL:
|
||||
dskType = MediaType.DVDPRDL;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDPRW:
|
||||
case DiskCategory.DVDPRW:
|
||||
dskType = MediaType.DVDPRW;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDPRWDL:
|
||||
case DiskCategory.DVDPRWDL:
|
||||
dskType = MediaType.DVDPRWDL;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDR:
|
||||
case DiskCategory.DVDR:
|
||||
dskType = MediaType.DVDR;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDRAM:
|
||||
case DiskCategory.DVDRAM:
|
||||
dskType = MediaType.DVDRAM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDROM:
|
||||
case DiskCategory.DVDROM:
|
||||
dskType = MediaType.DVDROM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.DVDRW:
|
||||
case DiskCategory.DVDRW:
|
||||
dskType = MediaType.DVDRW;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDR:
|
||||
case DiskCategory.HDDVDR:
|
||||
dskType = MediaType.HDDVDR;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDRAM:
|
||||
case DiskCategory.HDDVDRAM:
|
||||
dskType = MediaType.HDDVDRAM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDROM:
|
||||
case DiskCategory.HDDVDROM:
|
||||
dskType = MediaType.HDDVDROM;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.HDDVDRW:
|
||||
case DiskCategory.HDDVDRW:
|
||||
dskType = MediaType.HDDVDRW;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.Nintendo:
|
||||
case DiskCategory.Nintendo:
|
||||
dskType = MediaType.GOD;
|
||||
break;
|
||||
case Decoders.DVD.DiskCategory.UMD:
|
||||
case DiskCategory.UMD:
|
||||
dskType = MediaType.UMD;
|
||||
break;
|
||||
}
|
||||
@@ -203,15 +209,15 @@ namespace DiscImageChef.Core
|
||||
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 == Decoders.DVD.DVDSize.OneTwenty)
|
||||
if(dskType == MediaType.GOD && pfi.Value.DiscSize == DVDSize.OneTwenty)
|
||||
dskType = MediaType.WOD;
|
||||
|
||||
sidecar.OpticalDisc[0].Dimensions = new DimensionsType();
|
||||
if(dskType == MediaType.UMD) sidecar.OpticalDisc[0].Dimensions.Diameter = 60;
|
||||
else switch(pfi.Value.DiscSize) {
|
||||
case Decoders.DVD.DVDSize.Eighty: sidecar.OpticalDisc[0].Dimensions.Diameter = 80;
|
||||
case DVDSize.Eighty: sidecar.OpticalDisc[0].Dimensions.Diameter = 80;
|
||||
break;
|
||||
case Decoders.DVD.DVDSize.OneTwenty: sidecar.OpticalDisc[0].Dimensions.Diameter = 120;
|
||||
case DVDSize.OneTwenty: sidecar.OpticalDisc[0].Dimensions.Diameter = 120;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -234,18 +240,18 @@ namespace DiscImageChef.Core
|
||||
catch { sidecar.OpticalDisc[0].Sessions = 1; }
|
||||
|
||||
List<Track> tracks = image.GetTracks();
|
||||
List<Schemas.TrackType> trksLst = null;
|
||||
List<TrackType> trksLst = null;
|
||||
if(tracks != null)
|
||||
{
|
||||
sidecar.OpticalDisc[0].Tracks = new int[1];
|
||||
sidecar.OpticalDisc[0].Tracks[0] = tracks.Count;
|
||||
trksLst = new List<Schemas.TrackType>();
|
||||
trksLst = new List<TrackType>();
|
||||
}
|
||||
|
||||
InitProgress();
|
||||
foreach(Track trk in tracks)
|
||||
{
|
||||
Schemas.TrackType xmlTrk = new Schemas.TrackType();
|
||||
TrackType xmlTrk = new TrackType();
|
||||
switch(trk.TrackType)
|
||||
{
|
||||
case DiscImages.TrackType.Audio:
|
||||
@@ -321,11 +327,11 @@ namespace DiscImageChef.Core
|
||||
ulong doneSectors = 0;
|
||||
|
||||
// If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
|
||||
if(image.PluginUuid == new System.Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
|
||||
if(image.PluginUuid == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
|
||||
// Only if filter is none...
|
||||
(filterId == new System.Guid("12345678-AAAA-BBBB-CCCC-123456789000") ||
|
||||
(filterId == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") ||
|
||||
// ...or AppleDouble
|
||||
filterId == new System.Guid("1b2165ee-c9df-4b21-bbbb-9e5892b2df4d"))) xmlTrk.Checksums = sidecar.OpticalDisc[0].Checksums;
|
||||
filterId == new Guid("1b2165ee-c9df-4b21-bbbb-9e5892b2df4d"))) xmlTrk.Checksums = sidecar.OpticalDisc[0].Checksums;
|
||||
else
|
||||
{
|
||||
UpdateProgress("Track {0} of {1}", trk.TrackSequence, tracks.Count);
|
||||
|
||||
@@ -30,8 +30,10 @@
|
||||
// Copyright © 2011-2018 Natalia Portillo
|
||||
// ****************************************************************************/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using DiscImageChef.DiscImages;
|
||||
using Schemas;
|
||||
|
||||
@@ -39,8 +41,8 @@ namespace DiscImageChef.Core
|
||||
{
|
||||
public static partial class Sidecar
|
||||
{
|
||||
public static CICMMetadataType Create(ImagePlugin image, string imagePath, System.Guid filterId,
|
||||
System.Text.Encoding encoding)
|
||||
public static CICMMetadataType Create(ImagePlugin image, string imagePath, Guid filterId,
|
||||
Encoding encoding)
|
||||
{
|
||||
CICMMetadataType sidecar = new CICMMetadataType();
|
||||
PluginBase plugins = new PluginBase();
|
||||
|
||||
Reference in New Issue
Block a user