diff --git a/DiscImageChef.CommonTypes/ChangeLog b/DiscImageChef.CommonTypes/ChangeLog index f490b109e..328bfbc94 100644 --- a/DiscImageChef.CommonTypes/ChangeLog +++ b/DiscImageChef.CommonTypes/ChangeLog @@ -1,3 +1,9 @@ +2016-01-16 Natalia Portillo + + * MediaType.cs: + * DiscImageChef.CommonTypes.csproj: + Refactor most disk references to media. + 2015-12-31 Natalia Portillo * DiskType.cs: diff --git a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj index 924462731..19f4a6ab7 100644 --- a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj +++ b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj @@ -35,7 +35,7 @@ - + \ No newline at end of file diff --git a/DiscImageChef.CommonTypes/DiskType.cs b/DiscImageChef.CommonTypes/MediaType.cs similarity index 99% rename from DiscImageChef.CommonTypes/DiskType.cs rename to DiscImageChef.CommonTypes/MediaType.cs index 0403712c3..7bca758fe 100644 --- a/DiscImageChef.CommonTypes/DiskType.cs +++ b/DiscImageChef.CommonTypes/MediaType.cs @@ -39,8 +39,8 @@ using System; namespace DiscImageChef.CommonTypes { - // Disk types - public enum DiskType + // Media (disk, cartridge, tape, cassette, etc) types + public enum MediaType { /// Unknown disk type Unknown, diff --git a/DiscImageChef.DiscImages/Apple2MG.cs b/DiscImageChef.DiscImages/Apple2MG.cs index 09e050a82..b1e81a705 100644 --- a/DiscImageChef.DiscImages/Apple2MG.cs +++ b/DiscImageChef.DiscImages/Apple2MG.cs @@ -177,7 +177,7 @@ namespace DiscImageChef.ImagePlugins PluginUUID = new Guid("CBAF8824-BA5F-415F-953A-19A03519B2D1"); ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = false; ImageInfo.imageHasSessions = false; ImageInfo.imageVersion = null; @@ -185,13 +185,13 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageApplicationVersion = null; ImageInfo.imageCreator = null; ImageInfo.imageComments = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskSerialNumber = null; - ImageInfo.diskBarcode = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaSerialNumber = null; + ImageInfo.mediaBarcode = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -430,24 +430,24 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageComments; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { switch (ImageInfo.sectors) { case 455: - return DiskType.Apple32SS; + return MediaType.Apple32SS; case 910: - return DiskType.Apple32DS; + return MediaType.Apple32DS; case 560: - return DiskType.Apple33SS; + return MediaType.Apple33SS; case 1120: - return DiskType.Apple33DS; + return MediaType.Apple33DS; case 800: - return DiskType.AppleSonySS; + return MediaType.AppleSonySS; case 1600: - return DiskType.AppleSonyDS; + return MediaType.AppleSonyDS; default: - return DiskType.Unknown; + return MediaType.Unknown; } } @@ -479,7 +479,7 @@ namespace DiscImageChef.ImagePlugins #region Unsupported features - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } @@ -534,32 +534,32 @@ namespace DiscImageChef.ImagePlugins throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { return null; } - public override string GetDiskModel() + public override string GetMediaModel() { return null; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { return null; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { return null; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { return null; } - public override int GetDiskSequence() + public override int GetMediaSequence() { return 0; } @@ -633,7 +633,7 @@ namespace DiscImageChef.ImagePlugins throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return null; } diff --git a/DiscImageChef.DiscImages/CDRDAO.cs b/DiscImageChef.DiscImages/CDRDAO.cs index a08cd313f..555547640 100644 --- a/DiscImageChef.DiscImages/CDRDAO.cs +++ b/DiscImageChef.DiscImages/CDRDAO.cs @@ -128,7 +128,7 @@ namespace DiscImageChef.ImagePlugins /// Media catalog number public string mcn; /// Disk type - public DiskType disktype; + public MediaType disktype; /// Disk type string public string disktypestr; /// Disk CDDB ID @@ -222,18 +222,18 @@ namespace DiscImageChef.ImagePlugins imagePath = ""; ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = true; ImageInfo.imageHasSessions = true; ImageInfo.imageVersion = null; ImageInfo.imageApplicationVersion = null; ImageInfo.imageName = null; ImageInfo.imageCreator = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -420,19 +420,19 @@ namespace DiscImageChef.ImagePlugins switch (MatchDiskType.Groups["type"].Value) { case "CD_DA": - discimage.disktype = DiskType.CDDA; + discimage.disktype = MediaType.CDDA; break; case "CD_ROM": - discimage.disktype = DiskType.CDROM; + discimage.disktype = MediaType.CDROM; break; case "CD_ROM_XA": - discimage.disktype = DiskType.CDROMXA; + discimage.disktype = MediaType.CDROMXA; break; case "CD_I": - discimage.disktype = DiskType.CDI; + discimage.disktype = MediaType.CDI; break; default: - discimage.disktype = DiskType.CD; + discimage.disktype = MediaType.CD; break; } } @@ -866,15 +866,15 @@ namespace DiscImageChef.ImagePlugins ImageInfo.sectors += track.sectors; } - if (discimage.disktype == DiskType.CDG || discimage.disktype == DiskType.CDEG || discimage.disktype == DiskType.CDMIDI) + if (discimage.disktype == MediaType.CDG || discimage.disktype == MediaType.CDEG || discimage.disktype == MediaType.CDMIDI) ImageInfo.sectorSize = 2448; // CD+G subchannels ARE user data, as CD+G are useless without them - else if (discimage.disktype != DiskType.CDROMXA && discimage.disktype != DiskType.CDDA && discimage.disktype != DiskType.CDI && discimage.disktype != DiskType.CDPLUS) + else if (discimage.disktype != MediaType.CDROMXA && discimage.disktype != MediaType.CDDA && discimage.disktype != MediaType.CDI && discimage.disktype != MediaType.CDPLUS) ImageInfo.sectorSize = 2048; // Only data tracks else ImageInfo.sectorSize = 2352; // All others if (discimage.mcn != null) - ImageInfo.readableDiskTags.Add(DiskTagType.CD_MCN); + ImageInfo.readableMediaTags.Add(MediaTagType.CD_MCN); ImageInfo.imageApplication = "CDRDAO"; @@ -884,9 +884,9 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageLastModificationTime = fi.LastWriteTimeUtc; ImageInfo.imageComments = discimage.comment; - ImageInfo.diskSerialNumber = discimage.mcn; - ImageInfo.diskBarcode = discimage.barcode; - ImageInfo.diskType = discimage.disktype; + ImageInfo.mediaSerialNumber = discimage.mcn; + ImageInfo.mediaBarcode = discimage.barcode; + ImageInfo.mediaType = discimage.disktype; ImageInfo.readableSectorTags.Add(SectorTagType.CDTrackFlags); @@ -981,11 +981,11 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.sectorSize; } - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { switch (tag) { - case DiskTagType.CD_MCN: + case MediaTagType.CD_MCN: { if (discimage.mcn != null) { @@ -1502,19 +1502,19 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageComments; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { - return ImageInfo.diskSerialNumber; + return ImageInfo.mediaSerialNumber; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { - return ImageInfo.diskBarcode; + return ImageInfo.mediaBarcode; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return ImageInfo.diskType; + return ImageInfo.mediaType; } public override List GetPartitions() @@ -1653,7 +1653,7 @@ namespace DiscImageChef.ImagePlugins return true; } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return null; } @@ -1730,14 +1730,14 @@ namespace DiscImageChef.ImagePlugins #region Unsupported features - public override int GetDiskSequence() + public override int GetMediaSequence() { - return ImageInfo.diskSequence; + return ImageInfo.mediaSequence; } public override int GetLastDiskSequence() { - return ImageInfo.lastDiskSequence; + return ImageInfo.lastMediaSequence; } public override string GetDriveManufacturer() @@ -1755,19 +1755,19 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.driveSerialNumber; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { - return ImageInfo.diskPartNumber; + return ImageInfo.mediaPartNumber; } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { - return ImageInfo.diskManufacturer; + return ImageInfo.mediaManufacturer; } - public override string GetDiskModel() + public override string GetMediaModel() { - return ImageInfo.diskModel; + return ImageInfo.mediaModel; } public override string GetImageName() diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs index e432c6273..a9f5e4301 100644 --- a/DiscImageChef.DiscImages/CDRWin.cs +++ b/DiscImageChef.DiscImages/CDRWin.cs @@ -127,7 +127,7 @@ namespace DiscImageChef.ImagePlugins /// Media catalog number public string mcn; /// Disk type - public DiskType disktype; + public MediaType disktype; /// Disk type string public string disktypestr; /// Disk CDDB ID @@ -297,18 +297,18 @@ namespace DiscImageChef.ImagePlugins imagePath = ""; ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = true; ImageInfo.imageHasSessions = true; ImageInfo.imageVersion = null; ImageInfo.imageApplicationVersion = null; ImageInfo.imageName = null; ImageInfo.imageCreator = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -867,9 +867,9 @@ namespace DiscImageChef.ImagePlugins for (int t = 1; t <= cuetracks.Length; t++) discimage.tracks.Add(cuetracks[t - 1]); - discimage.disktype = CDRWinIsoBusterDiscTypeToDiskType(discimage.disktypestr); + discimage.disktype = CDRWinIsoBusterDiscTypeToMediaType(discimage.disktypestr); - if (discimage.disktype == DiskType.Unknown || discimage.disktype == DiskType.CD) + if (discimage.disktype == MediaType.Unknown || discimage.disktype == MediaType.CD) { bool data = false; bool cdg = false; @@ -912,19 +912,19 @@ namespace DiscImageChef.ImagePlugins } if (!data && !firstdata) - discimage.disktype = DiskType.CDDA; + discimage.disktype = MediaType.CDDA; else if (cdg) - discimage.disktype = DiskType.CDG; + discimage.disktype = MediaType.CDG; else if (cdi) - discimage.disktype = DiskType.CDI; + discimage.disktype = MediaType.CDI; else if (firstaudio && data && discimage.sessions.Count > 1 && mode2) - discimage.disktype = DiskType.CDPLUS; + discimage.disktype = MediaType.CDPLUS; else if ((firstdata && !data) || mode2) - discimage.disktype = DiskType.CDROMXA; + discimage.disktype = MediaType.CDROMXA; else if (!audio) - discimage.disktype = DiskType.CDROM; + discimage.disktype = MediaType.CDROM; else - discimage.disktype = DiskType.CD; + discimage.disktype = MediaType.CD; } // DEBUG information @@ -1193,17 +1193,17 @@ namespace DiscImageChef.ImagePlugins foreach (CDRWinTrack track in discimage.tracks) ImageInfo.sectors += track.sectors; - if (discimage.disktype == DiskType.CDG || discimage.disktype == DiskType.CDEG || discimage.disktype == DiskType.CDMIDI) + if (discimage.disktype == MediaType.CDG || discimage.disktype == MediaType.CDEG || discimage.disktype == MediaType.CDMIDI) ImageInfo.sectorSize = 2448; // CD+G subchannels ARE user data, as CD+G are useless without them - else if (discimage.disktype != DiskType.CDROMXA && discimage.disktype != DiskType.CDDA && discimage.disktype != DiskType.CDI && discimage.disktype != DiskType.CDPLUS) + else if (discimage.disktype != MediaType.CDROMXA && discimage.disktype != MediaType.CDDA && discimage.disktype != MediaType.CDI && discimage.disktype != MediaType.CDPLUS) ImageInfo.sectorSize = 2048; // Only data tracks else ImageInfo.sectorSize = 2352; // All others if (discimage.mcn != null) - ImageInfo.readableDiskTags.Add(DiskTagType.CD_MCN); + ImageInfo.readableMediaTags.Add(MediaTagType.CD_MCN); if (discimage.cdtextfile != null) - ImageInfo.readableDiskTags.Add(DiskTagType.CD_TEXT); + ImageInfo.readableMediaTags.Add(MediaTagType.CD_TEXT); // Detect ISOBuster extensions if (discimage.disktypestr != null || discimage.comment.ToLower().Contains("isobuster") || discimage.sessions.Count > 1) @@ -1217,9 +1217,9 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageLastModificationTime = fi.LastWriteTimeUtc; ImageInfo.imageComments = discimage.comment; - ImageInfo.diskSerialNumber = discimage.mcn; - ImageInfo.diskBarcode = discimage.barcode; - ImageInfo.diskType = discimage.disktype; + ImageInfo.mediaSerialNumber = discimage.mcn; + ImageInfo.mediaBarcode = discimage.barcode; + ImageInfo.mediaType = discimage.disktype; ImageInfo.readableSectorTags.Add(SectorTagType.CDTrackFlags); @@ -1317,11 +1317,11 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.sectorSize; } - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { switch (tag) { - case DiskTagType.CD_MCN: + case MediaTagType.CD_MCN: { if (discimage.mcn != null) { @@ -1329,7 +1329,7 @@ namespace DiscImageChef.ImagePlugins } throw new FeatureNotPresentImageException("Image does not contain MCN information."); } - case DiskTagType.CD_TEXT: + case MediaTagType.CD_TEXT: { if (discimage.cdtextfile != null) // TODO: Check that binary text file exists, open it, read it, send it to caller. @@ -1875,19 +1875,19 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageComments; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { - return ImageInfo.diskSerialNumber; + return ImageInfo.mediaSerialNumber; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { - return ImageInfo.diskBarcode; + return ImageInfo.mediaBarcode; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return ImageInfo.diskType; + return ImageInfo.mediaType; } public override List GetPartitions() @@ -2064,7 +2064,7 @@ namespace DiscImageChef.ImagePlugins return true; } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return null; } @@ -2160,62 +2160,62 @@ namespace DiscImageChef.ImagePlugins } } - static DiskType CDRWinIsoBusterDiscTypeToDiskType(string discType) + static MediaType CDRWinIsoBusterDiscTypeToMediaType(string discType) { switch (discType) { case CDRWinDiskTypeCD: - return DiskType.CD; + return MediaType.CD; case CDRWinDiskTypeCDRW: case CDRWinDiskTypeCDMRW: case CDRWinDiskTypeCDMRW2: - return DiskType.CDRW; + return MediaType.CDRW; case CDRWinDiskTypeDVD: - return DiskType.DVDROM; + return MediaType.DVDROM; case CDRWinDiskTypeDVDPRW: case CDRWinDiskTypeDVDPMRW: case CDRWinDiskTypeDVDPMRW2: - return DiskType.DVDPRW; + return MediaType.DVDPRW; case CDRWinDiskTypeDVDPRWDL: case CDRWinDiskTypeDVDPMRWDL: case CDRWinDiskTypeDVDPMRWDL2: - return DiskType.DVDPRWDL; + return MediaType.DVDPRWDL; case CDRWinDiskTypeDVDPR: case CDRWinDiskTypeDVDPVR: - return DiskType.DVDPR; + return MediaType.DVDPR; case CDRWinDiskTypeDVDPRDL: - return DiskType.DVDPRDL; + return MediaType.DVDPRDL; case CDRWinDiskTypeDVDRAM: - return DiskType.DVDRAM; + return MediaType.DVDRAM; case CDRWinDiskTypeDVDVR: case CDRWinDiskTypeDVDR: - return DiskType.DVDR; + return MediaType.DVDR; case CDRWinDiskTypeDVDRDL: - return DiskType.DVDRDL; + return MediaType.DVDRDL; case CDRWinDiskTypeDVDRW: case CDRWinDiskTypeDVDRWDL: case CDRWinDiskTypeDVDRW2: - return DiskType.DVDRW; + return MediaType.DVDRW; case CDRWinDiskTypeHDDVD: - return DiskType.HDDVDROM; + return MediaType.HDDVDROM; case CDRWinDiskTypeHDDVDRAM: - return DiskType.HDDVDRAM; + return MediaType.HDDVDRAM; case CDRWinDiskTypeHDDVDR: case CDRWinDiskTypeHDDVDRDL: - return DiskType.HDDVDR; + return MediaType.HDDVDR; case CDRWinDiskTypeHDDVDRW: case CDRWinDiskTypeHDDVDRWDL: - return DiskType.HDDVDRW; + return MediaType.HDDVDRW; case CDRWinDiskTypeBD: - return DiskType.BDROM; + return MediaType.BDROM; case CDRWinDiskTypeBDR: case CDRWinDiskTypeBDRDL: - return DiskType.BDR; + return MediaType.BDR; case CDRWinDiskTypeBDRE: case CDRWinDiskTypeBDREDL: - return DiskType.BDRE; + return MediaType.BDRE; default: - return DiskType.Unknown; + return MediaType.Unknown; } } @@ -2223,14 +2223,14 @@ namespace DiscImageChef.ImagePlugins #region Unsupported features - public override int GetDiskSequence() + public override int GetMediaSequence() { - return ImageInfo.diskSequence; + return ImageInfo.mediaSequence; } public override int GetLastDiskSequence() { - return ImageInfo.lastDiskSequence; + return ImageInfo.lastMediaSequence; } public override string GetDriveManufacturer() @@ -2248,19 +2248,19 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.driveSerialNumber; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { - return ImageInfo.diskPartNumber; + return ImageInfo.mediaPartNumber; } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { - return ImageInfo.diskManufacturer; + return ImageInfo.mediaManufacturer; } - public override string GetDiskModel() + public override string GetMediaModel() { - return ImageInfo.diskModel; + return ImageInfo.mediaModel; } public override string GetImageName() diff --git a/DiscImageChef.DiscImages/ChangeLog b/DiscImageChef.DiscImages/ChangeLog index d5039ebca..6c94abeb4 100644 --- a/DiscImageChef.DiscImages/ChangeLog +++ b/DiscImageChef.DiscImages/ChangeLog @@ -1,3 +1,18 @@ +2016-01-16 Natalia Portillo + + * VHD.cs: + * GDI.cs: + * Nero.cs: + * CDRDAO.cs: + * CDRWin.cs: + * Apple2MG.cs: + * TeleDisk.cs: + * ImageInfo.cs: + * DiskCopy42.cs: + * ImagePlugin.cs: + * ZZZRawImage.cs: + Refactor most disk references to media. + 2015-12-31 Natalia Portillo * ImagePlugin.cs: diff --git a/DiscImageChef.DiscImages/DiskCopy42.cs b/DiscImageChef.DiscImages/DiskCopy42.cs index 15bbf2cbf..b9b0852c1 100644 --- a/DiscImageChef.DiscImages/DiskCopy42.cs +++ b/DiscImageChef.DiscImages/DiskCopy42.cs @@ -134,7 +134,7 @@ namespace DiscImageChef.ImagePlugins PluginUUID = new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88"); ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = false; ImageInfo.imageHasSessions = false; ImageInfo.imageVersion = "4.2"; @@ -142,13 +142,13 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageApplicationVersion = "4.2"; ImageInfo.imageCreator = null; ImageInfo.imageComments = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskSerialNumber = null; - ImageInfo.diskBarcode = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaSerialNumber = null; + ImageInfo.mediaBarcode = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -325,25 +325,25 @@ namespace DiscImageChef.ImagePlugins switch (header.format) { case kSonyFormat400K: - ImageInfo.diskType = DiskType.AppleSonySS; + ImageInfo.mediaType = MediaType.AppleSonySS; break; case kSonyFormat800K: - ImageInfo.diskType = DiskType.AppleSonyDS; + ImageInfo.mediaType = MediaType.AppleSonyDS; break; case kSonyFormat720K: - ImageInfo.diskType = DiskType.DOS_35_DS_DD_9; + ImageInfo.mediaType = MediaType.DOS_35_DS_DD_9; break; case kSonyFormat1440K: - ImageInfo.diskType = DiskType.DOS_35_HD; + ImageInfo.mediaType = MediaType.DOS_35_HD; break; case kSonyFormat1680K: - ImageInfo.diskType = DiskType.DMF; + ImageInfo.mediaType = MediaType.DMF; break; case kSigmaFormatTwiggy: - ImageInfo.diskType = DiskType.AppleFileWare; + ImageInfo.mediaType = MediaType.AppleFileWare; break; default: - ImageInfo.diskType = DiskType.Unknown; + ImageInfo.mediaType = MediaType.Unknown; break; } @@ -382,7 +382,7 @@ namespace DiscImageChef.ImagePlugins return null; } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { byte[] data = new byte[header.dataSize]; byte[] tags = new byte[header.tagSize]; @@ -556,14 +556,14 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageName; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return ImageInfo.diskType; + return ImageInfo.mediaType; } #region Unsupported features - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } @@ -578,39 +578,39 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageComments; } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { - return ImageInfo.diskManufacturer; + return ImageInfo.mediaManufacturer; } - public override string GetDiskModel() + public override string GetMediaModel() { - return ImageInfo.diskModel; + return ImageInfo.mediaModel; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { - return ImageInfo.diskSerialNumber; + return ImageInfo.mediaSerialNumber; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { - return ImageInfo.diskBarcode; + return ImageInfo.mediaBarcode; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { - return ImageInfo.diskPartNumber; + return ImageInfo.mediaPartNumber; } - public override int GetDiskSequence() + public override int GetMediaSequence() { - return ImageInfo.diskSequence; + return ImageInfo.mediaSequence; } public override int GetLastDiskSequence() { - return ImageInfo.lastDiskSequence; + return ImageInfo.lastMediaSequence; } public override string GetDriveManufacturer() diff --git a/DiscImageChef.DiscImages/GDI.cs b/DiscImageChef.DiscImages/GDI.cs index 3cf7a3ae5..3539ab6d7 100644 --- a/DiscImageChef.DiscImages/GDI.cs +++ b/DiscImageChef.DiscImages/GDI.cs @@ -81,7 +81,7 @@ namespace DiscImageChef.ImagePlugins /// Tracks public List tracks; /// Disk type - public DiskType disktype; + public MediaType disktype; } #endregion Internal structures @@ -114,18 +114,18 @@ namespace DiscImageChef.ImagePlugins imagePath = ""; ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = true; ImageInfo.imageHasSessions = true; ImageInfo.imageVersion = null; ImageInfo.imageApplicationVersion = null; ImageInfo.imageName = null; ImageInfo.imageCreator = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -335,7 +335,7 @@ namespace DiscImageChef.ImagePlugins discimage.sessions.Add(_sessions[0]); discimage.sessions.Add(_sessions[1]); - discimage.disktype = DiskType.GDROM; + discimage.disktype = MediaType.GDROM; // DEBUG information DicConsole.DebugWriteLine("GDI plugin", "Disc image parsing results"); @@ -426,7 +426,7 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageCreationTime = fi.CreationTimeUtc; ImageInfo.imageLastModificationTime = fi.LastWriteTimeUtc; - ImageInfo.diskType = discimage.disktype; + ImageInfo.mediaType = discimage.disktype; ImageInfo.readableSectorTags.Add(SectorTagType.CDTrackFlags); @@ -463,7 +463,7 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.sectorSize; } - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { throw new FeatureSupportedButNotImplementedImageException("Feature not supported by image format"); } @@ -990,19 +990,19 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageComments; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { - return ImageInfo.diskSerialNumber; + return ImageInfo.mediaSerialNumber; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { - return ImageInfo.diskBarcode; + return ImageInfo.mediaBarcode; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return ImageInfo.diskType; + return ImageInfo.mediaType; } public override List GetPartitions() @@ -1184,7 +1184,7 @@ namespace DiscImageChef.ImagePlugins return true; } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return null; } @@ -1193,14 +1193,14 @@ namespace DiscImageChef.ImagePlugins #region Unsupported features - public override int GetDiskSequence() + public override int GetMediaSequence() { - return ImageInfo.diskSequence; + return ImageInfo.mediaSequence; } public override int GetLastDiskSequence() { - return ImageInfo.lastDiskSequence; + return ImageInfo.lastMediaSequence; } public override string GetDriveManufacturer() @@ -1218,19 +1218,19 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.driveSerialNumber; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { - return ImageInfo.diskPartNumber; + return ImageInfo.mediaPartNumber; } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { - return ImageInfo.diskManufacturer; + return ImageInfo.mediaManufacturer; } - public override string GetDiskModel() + public override string GetMediaModel() { - return ImageInfo.diskModel; + return ImageInfo.mediaModel; } public override string GetImageName() diff --git a/DiscImageChef.DiscImages/ImageInfo.cs b/DiscImageChef.DiscImages/ImageInfo.cs index 1e5d379aa..83efe7b53 100644 --- a/DiscImageChef.DiscImages/ImageInfo.cs +++ b/DiscImageChef.DiscImages/ImageInfo.cs @@ -11,7 +11,7 @@ namespace DiscImageChef.ImagePlugins public UInt64 imageSize; public UInt64 sectors; public UInt32 sectorSize; - public List readableDiskTags; + public List readableMediaTags; public List readableSectorTags; public string imageVersion; public string imageApplication; @@ -21,14 +21,14 @@ namespace DiscImageChef.ImagePlugins public DateTime imageLastModificationTime; public string imageName; public string imageComments; - public string diskManufacturer; - public string diskModel; - public string diskSerialNumber; - public string diskBarcode; - public string diskPartNumber; - public DiskType diskType; - public int diskSequence; - public int lastDiskSequence; + public string mediaManufacturer; + public string mediaModel; + public string mediaSerialNumber; + public string mediaBarcode; + public string mediaPartNumber; + public MediaType mediaType; + public int mediaSequence; + public int lastMediaSequence; public string driveManufacturer; public string driveModel; public string driveSerialNumber; diff --git a/DiscImageChef.DiscImages/ImagePlugin.cs b/DiscImageChef.DiscImages/ImagePlugin.cs index 20d500cbf..6b2bb42ad 100644 --- a/DiscImageChef.DiscImages/ImagePlugin.cs +++ b/DiscImageChef.DiscImages/ImagePlugin.cs @@ -107,7 +107,7 @@ namespace DiscImageChef.ImagePlugins /// /// Disk tag /// Tag type to read. - public abstract byte[] ReadDiskTag(DiskTagType tag); + public abstract byte[] ReadDiskTag(MediaTagType tag); /// /// Reads a sector's user data. @@ -268,51 +268,51 @@ namespace DiscImageChef.ImagePlugins // Functions to get information from disk represented by image /// - /// Gets the disk manufacturer. + /// Gets the media manufacturer. /// - /// The disk manufacturer. - public abstract string GetDiskManufacturer(); + /// The media manufacturer. + public abstract string GetMediaManufacturer(); /// - /// Gets the disk model. + /// Gets the media model. /// - /// The disk model. - public abstract string GetDiskModel(); + /// The media model. + public abstract string GetMediaModel(); /// - /// Gets the disk serial number. + /// Gets the media serial number. /// - /// The disk serial number. - public abstract string GetDiskSerialNumber(); + /// The media serial number. + public abstract string GetMediaSerialNumber(); /// - /// Gets the disk (or product) barcode. + /// Gets the media (or product) barcode. /// - /// The disk barcode. - public abstract string GetDiskBarcode(); + /// The media barcode. + public abstract string GetMediaBarcode(); /// - /// Gets the disk part number. + /// Gets the media part number. /// - /// The disk part number. - public abstract string GetDiskPartNumber(); + /// The media part number. + public abstract string GetMediaPartNumber(); /// - /// Gets the type of the disk. + /// Gets the type of the media. /// - /// The disk type. - public abstract DiskType GetDiskType(); + /// The media type. + public abstract MediaType GetMediaType(); /// - /// Gets the disk sequence. + /// Gets the media sequence. /// - /// The disk sequence, starting at 1. - public abstract int GetDiskSequence(); + /// The media sequence, starting at 1. + public abstract int GetMediaSequence(); /// - /// Gets the last disk in the sequence. + /// Gets the last media in the sequence. /// - /// The last disk in the sequence. + /// The last media in the sequence. public abstract int GetLastDiskSequence(); // Functions to get information from drive used to create image @@ -409,10 +409,10 @@ namespace DiscImageChef.ImagePlugins public abstract bool? VerifySectors(UInt64 sectorAddress, UInt32 length, UInt32 track, out List FailingLBAs, out List UnknownLBAs); /// - /// Verifies disk image internal checksum. + /// Verifies media image internal checksum. /// /// True if correct, false if incorrect, null if there is no internal checksum available - public abstract bool? VerifyDiskImage(); + public abstract bool? VerifyMediaImage(); // CD flags bitmask @@ -563,9 +563,9 @@ namespace DiscImageChef.ImagePlugins }; /// - /// Metadata present for each disk. + /// Metadata present for each media. /// - public enum DiskTagType + public enum MediaTagType { /// CD table of contents CD_TOC, diff --git a/DiscImageChef.DiscImages/Nero.cs b/DiscImageChef.DiscImages/Nero.cs index e9b0addba..bc1a8346e 100644 --- a/DiscImageChef.DiscImages/Nero.cs +++ b/DiscImageChef.DiscImages/Nero.cs @@ -871,7 +871,7 @@ namespace DiscImageChef.ImagePlugins imageNewFormat = false; ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); neroSessions = new Dictionary(); neroTracks = new Dictionary(); offsetmap = new Dictionary(); @@ -975,7 +975,7 @@ namespace DiscImageChef.ImagePlugins imageTracks = new List(); TrackISRCs = new Dictionary(); - ImageInfo.diskType = DiskType.CD; + ImageInfo.mediaType = MediaType.CD; ImageInfo.sectors = 0; ImageInfo.sectorSize = 0; @@ -1080,8 +1080,8 @@ namespace DiscImageChef.ImagePlugins neroDAOV1.LastTrack = tmpbuffer[21]; neroDAOV1.Tracks = new List(); - if (!ImageInfo.readableDiskTags.Contains(DiskTagType.CD_MCN)) - ImageInfo.readableDiskTags.Add(DiskTagType.CD_MCN); + if (!ImageInfo.readableMediaTags.Contains(MediaTagType.CD_MCN)) + ImageInfo.readableMediaTags.Add(MediaTagType.CD_MCN); if (!ImageInfo.readableSectorTags.Contains(SectorTagType.CDTrackISRC)) ImageInfo.readableSectorTags.Add(SectorTagType.CDTrackISRC); @@ -1163,8 +1163,8 @@ namespace DiscImageChef.ImagePlugins neroDAOV2.LastTrack = tmpbuffer[21]; neroDAOV2.Tracks = new List(); - if (!ImageInfo.readableDiskTags.Contains(DiskTagType.CD_MCN)) - ImageInfo.readableDiskTags.Add(DiskTagType.CD_MCN); + if (!ImageInfo.readableMediaTags.Contains(MediaTagType.CD_MCN)) + ImageInfo.readableMediaTags.Add(MediaTagType.CD_MCN); if (!ImageInfo.readableSectorTags.Contains(SectorTagType.CDTrackISRC)) ImageInfo.readableSectorTags.Add(SectorTagType.CDTrackISRC); @@ -1404,7 +1404,7 @@ namespace DiscImageChef.ImagePlugins DicConsole.DebugWriteLine("Nero plugin", "\tMedia type is {0} ({1})", (NeroMediaTypes)neroMediaTyp.Type, neroMediaTyp.Type); - ImageInfo.diskType = NeroMediaTypeToDiskType((NeroMediaTypes)neroMediaTyp.Type); + ImageInfo.mediaType = NeroMediaTypeToMediaType((NeroMediaTypes)neroMediaTyp.Type); break; } @@ -1475,16 +1475,16 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageLastModificationTime = imageInfo.LastWriteTimeUtc; ImageInfo.imageName = Path.GetFileNameWithoutExtension(imagePath); ImageInfo.imageComments = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskSerialNumber = null; - ImageInfo.diskBarcode = null; - ImageInfo.diskPartNumber = null; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaSerialNumber = null; + ImageInfo.mediaBarcode = null; + ImageInfo.mediaPartNumber = null; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; if (imageNewFormat) { ImageInfo.imageSize = footerV2.FirstChunkOffset; @@ -1677,13 +1677,13 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.sectorSize; } - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { switch (tag) { - case DiskTagType.CD_MCN: + case MediaTagType.CD_MCN: return UPC; - case DiskTagType.CD_TEXT: + case MediaTagType.CD_TEXT: throw new NotImplementedException("Not yet implemented"); default: throw new FeaturedNotSupportedByDiscImageException("Requested disk tag not supported by image"); @@ -2228,14 +2228,14 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageLastModificationTime; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { - return ImageInfo.diskBarcode; + return ImageInfo.mediaBarcode; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return ImageInfo.diskType; + return ImageInfo.mediaType; } public override List GetPartitions() @@ -2342,7 +2342,7 @@ namespace DiscImageChef.ImagePlugins return true; } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return null; } @@ -2351,56 +2351,56 @@ namespace DiscImageChef.ImagePlugins #region Private methods - static DiskType NeroMediaTypeToDiskType(NeroMediaTypes MediaType) + static MediaType NeroMediaTypeToMediaType(NeroMediaTypes type) { - switch (MediaType) + switch (type) { case NeroMediaTypes.NERO_MTYP_DDCD: - return DiskType.DDCD; + return MediaType.DDCD; case NeroMediaTypes.NERO_MTYP_DVD_M: case NeroMediaTypes.NERO_MTYP_DVD_M_R: - return DiskType.DVDR; + return MediaType.DVDR; case NeroMediaTypes.NERO_MTYP_DVD_P: case NeroMediaTypes.NERO_MTYP_DVD_P_R: - return DiskType.DVDPR; + return MediaType.DVDPR; case NeroMediaTypes.NERO_MTYP_DVD_RAM: - return DiskType.DVDRAM; + return MediaType.DVDRAM; case NeroMediaTypes.NERO_MTYP_ML: case NeroMediaTypes.NERO_MTYP_MRW: case NeroMediaTypes.NERO_MTYP_CDRW: - return DiskType.CDRW; + return MediaType.CDRW; case NeroMediaTypes.NERO_MTYP_CDR: - return DiskType.CDR; + return MediaType.CDR; case NeroMediaTypes.NERO_MTYP_DVD_ROM: - return DiskType.DVDROM; + return MediaType.DVDROM; case NeroMediaTypes.NERO_MTYP_CDROM: - return DiskType.CDROM; + return MediaType.CDROM; case NeroMediaTypes.NERO_MTYP_DVD_M_RW: - return DiskType.DVDRW; + return MediaType.DVDRW; case NeroMediaTypes.NERO_MTYP_DVD_P_RW: - return DiskType.DVDPRW; + return MediaType.DVDPRW; case NeroMediaTypes.NERO_MTYP_DVD_P_R9: - return DiskType.DVDPRDL; + return MediaType.DVDPRDL; case NeroMediaTypes.NERO_MTYP_DVD_M_R9: - return DiskType.DVDRDL; + return MediaType.DVDRDL; case NeroMediaTypes.NERO_MTYP_BD: case NeroMediaTypes.NERO_MTYP_BD_ANY: case NeroMediaTypes.NERO_MTYP_BD_ROM: - return DiskType.BDROM; + return MediaType.BDROM; case NeroMediaTypes.NERO_MTYP_BD_R: - return DiskType.BDR; + return MediaType.BDR; case NeroMediaTypes.NERO_MTYP_BD_RE: - return DiskType.BDRE; + return MediaType.BDRE; case NeroMediaTypes.NERO_MTYP_HD_DVD: case NeroMediaTypes.NERO_MTYP_HD_DVD_ANY: case NeroMediaTypes.NERO_MTYP_HD_DVD_ROM: - return DiskType.HDDVDROM; + return MediaType.HDDVDROM; case NeroMediaTypes.NERO_MTYP_HD_DVD_R: - return DiskType.HDDVDR; + return MediaType.HDDVDR; case NeroMediaTypes.NERO_MTYP_HD_DVD_RW: - return DiskType.HDDVDRW; + return MediaType.HDDVDRW; default: - return DiskType.CD; + return MediaType.CD; } } @@ -2453,7 +2453,7 @@ namespace DiscImageChef.ImagePlugins #region Unsupported features - public override int GetDiskSequence() + public override int GetMediaSequence() { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } @@ -2478,17 +2478,17 @@ namespace DiscImageChef.ImagePlugins throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override string GetDiskModel() + public override string GetMediaModel() { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } @@ -2508,7 +2508,7 @@ namespace DiscImageChef.ImagePlugins throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } diff --git a/DiscImageChef.DiscImages/TeleDisk.cs b/DiscImageChef.DiscImages/TeleDisk.cs index ce0b5b7da..81dc858b2 100644 --- a/DiscImageChef.DiscImages/TeleDisk.cs +++ b/DiscImageChef.DiscImages/TeleDisk.cs @@ -211,19 +211,19 @@ namespace DiscImageChef.ImagePlugins PluginUUID = new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88"); ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = false; ImageInfo.imageHasSessions = false; ImageInfo.imageApplication = "Sydex TeleDisk"; ImageInfo.imageComments = null; ImageInfo.imageCreator = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskSerialNumber = null; - ImageInfo.diskBarcode = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaSerialNumber = null; + ImageInfo.mediaBarcode = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -577,7 +577,7 @@ namespace DiscImageChef.ImagePlugins } ImageInfo.sectors = (ulong)sectorsData.Count; - ImageInfo.diskType = DecodeTeleDiskDiskType(); + ImageInfo.mediaType = DecodeTeleDiskDiskType(); stream.Close(); @@ -695,9 +695,9 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageName; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return ImageInfo.diskType; + return ImageInfo.mediaType; } public override bool? VerifySector(UInt64 sectorAddress) @@ -733,7 +733,7 @@ namespace DiscImageChef.ImagePlugins return null; } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return ADiskCRCHasFailed; } @@ -868,7 +868,7 @@ namespace DiscImageChef.ImagePlugins return decodedData; } - DiskType DecodeTeleDiskDiskType() + MediaType DecodeTeleDiskDiskType() { switch (header.driveType) { @@ -882,64 +882,64 @@ namespace DiscImageChef.ImagePlugins { // Acorn disk uses 256 bytes/sector if (ImageInfo.sectorSize == 256) - return DiskType.ACORN_525_SS_DD_40; + return MediaType.ACORN_525_SS_DD_40; else // DOS disks use 512 bytes/sector - return DiskType.DOS_525_SS_DD_8; + return MediaType.DOS_525_SS_DD_8; } case 184320: { // Atari disk uses 256 bytes/sector if (ImageInfo.sectorSize == 256) - return DiskType.ATARI_525_DD; + return MediaType.ATARI_525_DD; else // DOS disks use 512 bytes/sector - return DiskType.DOS_525_SS_DD_9; + return MediaType.DOS_525_SS_DD_9; } case 327680: { // Acorn disk uses 256 bytes/sector if (ImageInfo.sectorSize == 256) - return DiskType.ACORN_525_SS_DD_80; + return MediaType.ACORN_525_SS_DD_80; else // DOS disks use 512 bytes/sector - return DiskType.DOS_525_DS_DD_8; + return MediaType.DOS_525_DS_DD_8; } case 368640: - return DiskType.DOS_525_DS_DD_9; + return MediaType.DOS_525_DS_DD_9; case 1228800: - return DiskType.DOS_525_HD; + return MediaType.DOS_525_HD; case 102400: - return DiskType.ACORN_525_SS_SD_40; + return MediaType.ACORN_525_SS_SD_40; case 204800: - return DiskType.ACORN_525_SS_SD_80; + return MediaType.ACORN_525_SS_SD_80; case 655360: - return DiskType.ACORN_525_DS_DD; + return MediaType.ACORN_525_DS_DD; case 92160: - return DiskType.ATARI_525_SD; + return MediaType.ATARI_525_SD; case 133120: - return DiskType.ATARI_525_ED; + return MediaType.ATARI_525_ED; case 1310720: - return DiskType.NEC_525_HD; + return MediaType.NEC_525_HD; case 1261568: - return DiskType.SHARP_525; + return MediaType.SHARP_525; case 839680: - return DiskType.FDFORMAT_525_DD; + return MediaType.FDFORMAT_525_DD; case 1304320: - return DiskType.ECMA_99_8; + return MediaType.ECMA_99_8; case 1223424: - return DiskType.ECMA_99_15; + return MediaType.ECMA_99_15; case 1061632: - return DiskType.ECMA_99_26; + return MediaType.ECMA_99_26; case 80384: - return DiskType.ECMA_66; + return MediaType.ECMA_66; case 325632: - return DiskType.ECMA_70; + return MediaType.ECMA_70; case 653312: - return DiskType.ECMA_78; + return MediaType.ECMA_78; case 737280: - return DiskType.ECMA_78_2; + return MediaType.ECMA_78_2; default: { DicConsole.DebugWriteLine("TeleDisk plugin", "Unknown 5,25\" disk with {0} bytes", totalDiskSize); - return DiskType.Unknown; + return MediaType.Unknown; } } } @@ -950,40 +950,40 @@ namespace DiscImageChef.ImagePlugins switch (totalDiskSize) { case 327680: - return DiskType.DOS_35_SS_DD_8; + return MediaType.DOS_35_SS_DD_8; case 368640: - return DiskType.DOS_35_SS_DD_9; + return MediaType.DOS_35_SS_DD_9; case 655360: - return DiskType.DOS_35_DS_DD_8; + return MediaType.DOS_35_DS_DD_8; case 737280: - return DiskType.DOS_35_DS_DD_9; + return MediaType.DOS_35_DS_DD_9; case 1474560: - return DiskType.DOS_35_HD; + return MediaType.DOS_35_HD; case 2949120: - return DiskType.DOS_35_ED; + return MediaType.DOS_35_ED; case 1720320: - return DiskType.DMF; + return MediaType.DMF; case 1763328: - return DiskType.DMF_82; + return MediaType.DMF_82; case 1884160: // Irreal size, seen as BIOS with TSR, 23 sectors/track case 1860608: // Real data size, sum of all sectors - return DiskType.XDF_35; + return MediaType.XDF_35; case 819200: - return DiskType.CBM_35_DD; + return MediaType.CBM_35_DD; case 901120: - return DiskType.CBM_AMIGA_35_DD; + return MediaType.CBM_AMIGA_35_DD; case 1802240: - return DiskType.CBM_AMIGA_35_HD; + return MediaType.CBM_AMIGA_35_HD; case 1310720: - return DiskType.NEC_35_HD_8; + return MediaType.NEC_35_HD_8; case 1228800: - return DiskType.NEC_35_HD_15; + return MediaType.NEC_35_HD_15; case 1261568: - return DiskType.SHARP_35; + return MediaType.SHARP_35; default: { DicConsole.DebugWriteLine("TeleDisk plugin", "Unknown 3,5\" disk with {0} bytes", totalDiskSize); - return DiskType.Unknown; + return MediaType.Unknown; } } } @@ -992,53 +992,53 @@ namespace DiscImageChef.ImagePlugins switch (totalDiskSize) { case 81664: - return DiskType.IBM23FD; + return MediaType.IBM23FD; case 242944: - return DiskType.IBM33FD_128; + return MediaType.IBM33FD_128; case 287488: - return DiskType.IBM33FD_256; + return MediaType.IBM33FD_256; case 306432: - return DiskType.IBM33FD_512; + return MediaType.IBM33FD_512; case 499200: - return DiskType.IBM43FD_128; + return MediaType.IBM43FD_128; case 574976: - return DiskType.IBM43FD_256; + return MediaType.IBM43FD_256; case 995072: - return DiskType.IBM53FD_256; + return MediaType.IBM53FD_256; case 1146624: - return DiskType.IBM53FD_512; + return MediaType.IBM53FD_512; case 1222400: - return DiskType.IBM53FD_1024; + return MediaType.IBM53FD_1024; case 256256: // Same size, with same disk geometry, for DEC RX01, NEC and ECMA, return ECMA - return DiskType.ECMA_54; + return MediaType.ECMA_54; case 512512: { // DEC disk uses 256 bytes/sector if (ImageInfo.sectorSize == 256) - return DiskType.RX02; + return MediaType.RX02; else // ECMA disks use 128 bytes/sector - return DiskType.ECMA_59; + return MediaType.ECMA_59; } case 1261568: - return DiskType.NEC_8_DD; + return MediaType.NEC_8_DD; case 1255168: - return DiskType.ECMA_69_8; + return MediaType.ECMA_69_8; case 1177344: - return DiskType.ECMA_69_15; + return MediaType.ECMA_69_15; case 1021696: - return DiskType.ECMA_69_26; + return MediaType.ECMA_69_26; default: { DicConsole.DebugWriteLine("TeleDisk plugin", "Unknown 8\" disk with {0} bytes", totalDiskSize); - return DiskType.Unknown; + return MediaType.Unknown; } } } default: { DicConsole.DebugWriteLine("TeleDisk plugin", "Unknown drive type {1} with {0} bytes", totalDiskSize, header.driveType); - return DiskType.Unknown; + return MediaType.Unknown; } } @@ -1058,7 +1058,7 @@ namespace DiscImageChef.ImagePlugins throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } @@ -1073,39 +1073,39 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageComments; } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { - return ImageInfo.diskManufacturer; + return ImageInfo.mediaManufacturer; } - public override string GetDiskModel() + public override string GetMediaModel() { - return ImageInfo.diskModel; + return ImageInfo.mediaModel; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { - return ImageInfo.diskSerialNumber; + return ImageInfo.mediaSerialNumber; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { - return ImageInfo.diskBarcode; + return ImageInfo.mediaBarcode; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { - return ImageInfo.diskPartNumber; + return ImageInfo.mediaPartNumber; } - public override int GetDiskSequence() + public override int GetMediaSequence() { - return ImageInfo.diskSequence; + return ImageInfo.mediaSequence; } public override int GetLastDiskSequence() { - return ImageInfo.lastDiskSequence; + return ImageInfo.lastMediaSequence; } public override string GetDriveManufacturer() diff --git a/DiscImageChef.DiscImages/VHD.cs b/DiscImageChef.DiscImages/VHD.cs index a8f914a96..d4386e912 100644 --- a/DiscImageChef.DiscImages/VHD.cs +++ b/DiscImageChef.DiscImages/VHD.cs @@ -373,7 +373,7 @@ namespace DiscImageChef.ImagePlugins PluginUUID = new Guid("8014d88f-64cd-4484-9441-7635c632958a"); ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = false; ImageInfo.imageHasSessions = false; ImageInfo.imageVersion = null; @@ -381,13 +381,13 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageApplicationVersion = null; ImageInfo.imageCreator = null; ImageInfo.imageComments = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskSerialNumber = null; - ImageInfo.diskBarcode = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaSerialNumber = null; + ImageInfo.mediaBarcode = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -971,9 +971,9 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageName; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return DiskType.GENERIC_HDD; + return MediaType.GENERIC_HDD; } public override byte[] ReadSector(ulong sectorAddress) @@ -1171,7 +1171,7 @@ namespace DiscImageChef.ImagePlugins return null; } - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } @@ -1226,32 +1226,32 @@ namespace DiscImageChef.ImagePlugins throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { return null; } - public override string GetDiskModel() + public override string GetMediaModel() { return null; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { return null; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { return null; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { return null; } - public override int GetDiskSequence() + public override int GetMediaSequence() { return 0; } @@ -1325,7 +1325,7 @@ namespace DiscImageChef.ImagePlugins throw new FeatureUnsupportedImageException("Feature not supported by image format"); } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return null; } diff --git a/DiscImageChef.DiscImages/ZZZRawImage.cs b/DiscImageChef.DiscImages/ZZZRawImage.cs index 82d633e2c..f59044de4 100644 --- a/DiscImageChef.DiscImages/ZZZRawImage.cs +++ b/DiscImageChef.DiscImages/ZZZRawImage.cs @@ -60,7 +60,7 @@ namespace DiscImageChef.ImagePlugins PluginUUID = new Guid("12345678-AAAA-BBBB-CCCC-123456789000"); ImageInfo = new ImageInfo(); ImageInfo.readableSectorTags = new List(); - ImageInfo.readableDiskTags = new List(); + ImageInfo.readableMediaTags = new List(); ImageInfo.imageHasPartitions = false; ImageInfo.imageHasSessions = false; ImageInfo.imageVersion = null; @@ -68,13 +68,13 @@ namespace DiscImageChef.ImagePlugins ImageInfo.imageApplicationVersion = null; ImageInfo.imageCreator = null; ImageInfo.imageComments = null; - ImageInfo.diskManufacturer = null; - ImageInfo.diskModel = null; - ImageInfo.diskSerialNumber = null; - ImageInfo.diskBarcode = null; - ImageInfo.diskPartNumber = null; - ImageInfo.diskSequence = 0; - ImageInfo.lastDiskSequence = 0; + ImageInfo.mediaManufacturer = null; + ImageInfo.mediaModel = null; + ImageInfo.mediaSerialNumber = null; + ImageInfo.mediaBarcode = null; + ImageInfo.mediaPartNumber = null; + ImageInfo.mediaSequence = 0; + ImageInfo.lastMediaSequence = 0; ImageInfo.driveManufacturer = null; ImageInfo.driveModel = null; ImageInfo.driveSerialNumber = null; @@ -261,17 +261,17 @@ namespace DiscImageChef.ImagePlugins break; } - ImageInfo.diskType = CalculateDiskType(); + ImageInfo.mediaType = CalculateDiskType(); - switch (ImageInfo.diskType) + switch (ImageInfo.mediaType) { - case DiskType.CD: - case DiskType.DVDPR: - case DiskType.DVDR: - case DiskType.DVDRDL: - case DiskType.DVDPRDL: - case DiskType.BDR: - case DiskType.BDRXL: + case MediaType.CD: + case MediaType.DVDPR: + case MediaType.DVDR: + case MediaType.DVDRDL: + case MediaType.DVDPRDL: + case MediaType.BDR: + case MediaType.BDRXL: ImageInfo.xmlMediaType = XmlMediaType.OpticalDisc; break; default: @@ -356,9 +356,9 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageName; } - public override DiskType GetDiskType() + public override MediaType GetMediaType() { - return ImageInfo.diskType; + return ImageInfo.mediaType; } public override bool? VerifySector(UInt64 sectorAddress) @@ -393,7 +393,7 @@ namespace DiscImageChef.ImagePlugins return null; } - public override bool? VerifyDiskImage() + public override bool? VerifyMediaImage() { return null; } @@ -548,138 +548,138 @@ namespace DiscImageChef.ImagePlugins #region Private methods - DiskType CalculateDiskType() + MediaType CalculateDiskType() { if (ImageInfo.sectorSize == 2048) { if (ImageInfo.sectors <= 360000) - return DiskType.CD; + return MediaType.CD; if (ImageInfo.sectors <= 2295104) - return DiskType.DVDPR; + return MediaType.DVDPR; if (ImageInfo.sectors <= 2298496) - return DiskType.DVDR; + return MediaType.DVDR; if (ImageInfo.sectors <= 4171712) - return DiskType.DVDRDL; + return MediaType.DVDRDL; if (ImageInfo.sectors <= 4173824) - return DiskType.DVDPRDL; + return MediaType.DVDPRDL; if (ImageInfo.sectors <= 24438784) - return DiskType.BDR; + return MediaType.BDR; if (ImageInfo.sectors <= 62500864) - return DiskType.BDRXL; - return DiskType.Unknown; + return MediaType.BDRXL; + return MediaType.Unknown; } else { switch (ImageInfo.imageSize) { case 80384: - return DiskType.ECMA_66; + return MediaType.ECMA_66; case 81664: - return DiskType.IBM23FD; + return MediaType.IBM23FD; case 92160: - return DiskType.ATARI_525_SD; + return MediaType.ATARI_525_SD; case 102400: - return DiskType.ACORN_525_SS_SD_40; + return MediaType.ACORN_525_SS_SD_40; case 116480: - return DiskType.Apple32SS; + return MediaType.Apple32SS; case 133120: - return DiskType.ATARI_525_ED; + return MediaType.ATARI_525_ED; case 143360: - return DiskType.Apple33SS; + return MediaType.Apple33SS; case 163840: - return DiskType.DOS_525_SS_DD_8; + return MediaType.DOS_525_SS_DD_8; case 184320: - return DiskType.DOS_525_SS_DD_9; + return MediaType.DOS_525_SS_DD_9; case 204800: - return DiskType.ACORN_525_SS_SD_80; + return MediaType.ACORN_525_SS_SD_80; case 232960: - return DiskType.Apple32DS; + return MediaType.Apple32DS; case 242944: - return DiskType.IBM33FD_128; + return MediaType.IBM33FD_128; case 256256: - return DiskType.ECMA_54; + return MediaType.ECMA_54; case 286720: - return DiskType.Apple33DS; + return MediaType.Apple33DS; case 287488: - return DiskType.IBM33FD_256; + return MediaType.IBM33FD_256; case 306432: - return DiskType.IBM33FD_512; + return MediaType.IBM33FD_512; case 325632: - return DiskType.ECMA_70; + return MediaType.ECMA_70; case 327680: - return DiskType.DOS_525_DS_DD_8; + return MediaType.DOS_525_DS_DD_8; case 368640: - return DiskType.DOS_525_DS_DD_9; + return MediaType.DOS_525_DS_DD_9; case 409600: - return DiskType.AppleSonySS; + return MediaType.AppleSonySS; case 495872: - return DiskType.IBM43FD_128; + return MediaType.IBM43FD_128; case 512512: - return DiskType.ECMA_59; + return MediaType.ECMA_59; case 653312: - return DiskType.ECMA_78; + return MediaType.ECMA_78; case 655360: - return DiskType.ACORN_525_DS_DD; + return MediaType.ACORN_525_DS_DD; case 737280: - return DiskType.DOS_35_DS_DD_9; + return MediaType.DOS_35_DS_DD_9; case 819200: - return DiskType.AppleSonyDS; + return MediaType.AppleSonyDS; case 839680: - return DiskType.FDFORMAT_35_DD; + return MediaType.FDFORMAT_35_DD; case 901120: - return DiskType.CBM_AMIGA_35_DD; + return MediaType.CBM_AMIGA_35_DD; case 988416: - return DiskType.IBM43FD_256; + return MediaType.IBM43FD_256; case 995072: - return DiskType.IBM53FD_256; + return MediaType.IBM53FD_256; case 1021696: - return DiskType.ECMA_99_26; + return MediaType.ECMA_99_26; case 1146624: - return DiskType.IBM53FD_512; + return MediaType.IBM53FD_512; case 1177344: - return DiskType.ECMA_99_15; + return MediaType.ECMA_99_15; case 1222400: - return DiskType.IBM53FD_1024; + return MediaType.IBM53FD_1024; case 1228800: - return DiskType.DOS_525_HD; + return MediaType.DOS_525_HD; case 1255168: - return DiskType.ECMA_69_8; + return MediaType.ECMA_69_8; case 1261568: - return DiskType.NEC_8_DD; + return MediaType.NEC_8_DD; case 1304320: - return DiskType.ECMA_99_8; + return MediaType.ECMA_99_8; case 1310720: - return DiskType.NEC_525_HD; + return MediaType.NEC_525_HD; case 1427456: - return DiskType.FDFORMAT_525_HD; + return MediaType.FDFORMAT_525_HD; case 1474560: - return DiskType.DOS_35_HD; + return MediaType.DOS_35_HD; case 1720320: - return DiskType.DMF; + return MediaType.DMF; case 1763328: - return DiskType.FDFORMAT_35_HD; + return MediaType.FDFORMAT_35_HD; case 1802240: - return DiskType.CBM_AMIGA_35_HD; + return MediaType.CBM_AMIGA_35_HD; case 1880064: - return DiskType.XDF_35; + return MediaType.XDF_35; case 1884160: - return DiskType.XDF_35; + return MediaType.XDF_35; case 2949120: - return DiskType.DOS_35_ED; + return MediaType.DOS_35_ED; case 128000000: - return DiskType.ECMA_154; + return MediaType.ECMA_154; case 229632000: - return DiskType.ECMA_201; + return MediaType.ECMA_201; case 481520640: - return DiskType.ECMA_183_512; + return MediaType.ECMA_183_512; case 533403648: - return DiskType.ECMA_183_1024; + return MediaType.ECMA_183_1024; case 596787200: - return DiskType.ECMA_184_512; + return MediaType.ECMA_184_512; case 654540800: - return DiskType.ECMA_184_1024; + return MediaType.ECMA_184_1024; default: - return DiskType.GENERIC_HDD; + return MediaType.GENERIC_HDD; } } } @@ -723,7 +723,7 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageApplicationVersion; } - public override byte[] ReadDiskTag(DiskTagType tag) + public override byte[] ReadDiskTag(MediaTagType tag) { throw new FeatureUnsupportedImageException("Feature not supported by image format"); } @@ -738,39 +738,39 @@ namespace DiscImageChef.ImagePlugins return ImageInfo.imageComments; } - public override string GetDiskManufacturer() + public override string GetMediaManufacturer() { - return ImageInfo.diskManufacturer; + return ImageInfo.mediaManufacturer; } - public override string GetDiskModel() + public override string GetMediaModel() { - return ImageInfo.diskModel; + return ImageInfo.mediaModel; } - public override string GetDiskSerialNumber() + public override string GetMediaSerialNumber() { - return ImageInfo.diskSerialNumber; + return ImageInfo.mediaSerialNumber; } - public override string GetDiskBarcode() + public override string GetMediaBarcode() { - return ImageInfo.diskBarcode; + return ImageInfo.mediaBarcode; } - public override string GetDiskPartNumber() + public override string GetMediaPartNumber() { - return ImageInfo.diskPartNumber; + return ImageInfo.mediaPartNumber; } - public override int GetDiskSequence() + public override int GetMediaSequence() { - return ImageInfo.diskSequence; + return ImageInfo.mediaSequence; } public override int GetLastDiskSequence() { - return ImageInfo.lastDiskSequence; + return ImageInfo.lastMediaSequence; } public override string GetDriveManufacturer() diff --git a/DiscImageChef.Filesystems/ChangeLog b/DiscImageChef.Filesystems/ChangeLog index 4a48b5980..9023e2ab7 100644 --- a/DiscImageChef.Filesystems/ChangeLog +++ b/DiscImageChef.Filesystems/ChangeLog @@ -1,3 +1,8 @@ +2016-01-16 Natalia Portillo + + * FAT.cs: + Refactor most disk references to media. + 2015-12-31 Natalia Portillo * ISO9660.cs: diff --git a/DiscImageChef.Filesystems/FAT.cs b/DiscImageChef.Filesystems/FAT.cs index 19e079cc1..09e74f08b 100644 --- a/DiscImageChef.Filesystems/FAT.cs +++ b/DiscImageChef.Filesystems/FAT.cs @@ -364,7 +364,7 @@ namespace DiscImageChef.Plugins sb.AppendLine("Pre-DOS 2.0 Microsoft FAT12."); sb.AppendLine("***WARNING***"); sb.AppendLine("This may be a false positive."); - sb.AppendFormat("Disk image identifies disk type as {0}.", imagePlugin.GetDiskType()).AppendLine(); + sb.AppendFormat("Disk image identifies disk type as {0}.", imagePlugin.GetMediaType()).AppendLine(); } information = sb.ToString(); diff --git a/DiscImageChef.Metadata/ChangeLog b/DiscImageChef.Metadata/ChangeLog index 0208e43f5..ec2957ac7 100644 --- a/DiscImageChef.Metadata/ChangeLog +++ b/DiscImageChef.Metadata/ChangeLog @@ -1,3 +1,11 @@ +2016-01-16 Natalia Portillo + + * DiskType.cs: + * MediaType.cs: + * Dimensions.cs: + * DiscImageChef.Metadata.csproj: + Refactor most disk references to media. + 2016-01-16 Natalia Portillo * Dimensions.cs: diff --git a/DiscImageChef.Metadata/Dimensions.cs b/DiscImageChef.Metadata/Dimensions.cs index 1c4afc624..5fa01cc18 100644 --- a/DiscImageChef.Metadata/Dimensions.cs +++ b/DiscImageChef.Metadata/Dimensions.cs @@ -35,51 +35,50 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; using Schemas; namespace DiscImageChef.Metadata { public static class Dimensions { - public static DimensionsType DimensionsFromDiskType(CommonTypes.DiskType dskType) + public static DimensionsType DimensionsFromMediaType(CommonTypes.MediaType dskType) { DimensionsType dmns = new DimensionsType(); switch (dskType) { #region 5.25" floppy disk - case DiscImageChef.CommonTypes.DiskType.Apple32SS: - case DiscImageChef.CommonTypes.DiskType.Apple32DS: - case DiscImageChef.CommonTypes.DiskType.Apple33SS: - case DiscImageChef.CommonTypes.DiskType.Apple33DS: - case DiscImageChef.CommonTypes.DiskType.AppleFileWare: - case DiscImageChef.CommonTypes.DiskType.DOS_525_SS_DD_8: - case DiscImageChef.CommonTypes.DiskType.DOS_525_SS_DD_9: - case DiscImageChef.CommonTypes.DiskType.DOS_525_DS_DD_8: - case DiscImageChef.CommonTypes.DiskType.DOS_525_DS_DD_9: - case DiscImageChef.CommonTypes.DiskType.DOS_525_HD: - case DiscImageChef.CommonTypes.DiskType.XDF_525: - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_SD_40: - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_SD_80: - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_DD_40: - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_DD_80: - case DiscImageChef.CommonTypes.DiskType.ACORN_525_DS_DD: - case DiscImageChef.CommonTypes.DiskType.ATARI_525_SD: - case DiscImageChef.CommonTypes.DiskType.ATARI_525_ED: - case DiscImageChef.CommonTypes.DiskType.ATARI_525_DD: - case DiscImageChef.CommonTypes.DiskType.CBM_1540: - case DiscImageChef.CommonTypes.DiskType.ECMA_66: - case DiscImageChef.CommonTypes.DiskType.ECMA_70: - case DiscImageChef.CommonTypes.DiskType.NEC_525_HD: - case DiscImageChef.CommonTypes.DiskType.ECMA_78: - case DiscImageChef.CommonTypes.DiskType.ECMA_78_2: - case DiscImageChef.CommonTypes.DiskType.ECMA_99_8: - case DiscImageChef.CommonTypes.DiskType.ECMA_99_15: - case DiscImageChef.CommonTypes.DiskType.ECMA_99_26: - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_525_DD: - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_525_HD: - case DiscImageChef.CommonTypes.DiskType.SHARP_525: + case CommonTypes.MediaType.Apple32SS: + case CommonTypes.MediaType.Apple32DS: + case CommonTypes.MediaType.Apple33SS: + case CommonTypes.MediaType.Apple33DS: + case CommonTypes.MediaType.AppleFileWare: + case CommonTypes.MediaType.DOS_525_SS_DD_8: + 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.XDF_525: + case CommonTypes.MediaType.ACORN_525_SS_SD_40: + case CommonTypes.MediaType.ACORN_525_SS_SD_80: + 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.ATARI_525_SD: + case CommonTypes.MediaType.ATARI_525_ED: + case CommonTypes.MediaType.ATARI_525_DD: + case CommonTypes.MediaType.CBM_1540: + case CommonTypes.MediaType.ECMA_66: + case CommonTypes.MediaType.ECMA_70: + case CommonTypes.MediaType.NEC_525_HD: + case CommonTypes.MediaType.ECMA_78: + case CommonTypes.MediaType.ECMA_78_2: + case CommonTypes.MediaType.ECMA_99_8: + case CommonTypes.MediaType.ECMA_99_15: + case CommonTypes.MediaType.ECMA_99_26: + case CommonTypes.MediaType.FDFORMAT_525_DD: + case CommonTypes.MediaType.FDFORMAT_525_HD: + case CommonTypes.MediaType.SHARP_525: // According to ECMA-99 et al dmns.Height = 133.3; dmns.HeightSpecified = true; @@ -90,29 +89,29 @@ namespace DiscImageChef.Metadata #endregion 5.25" floppy disk #region 3.5" floppy disk - case DiscImageChef.CommonTypes.DiskType.AppleSonySS: - case DiscImageChef.CommonTypes.DiskType.AppleSonyDS: - case DiscImageChef.CommonTypes.DiskType.DOS_35_SS_DD_8: - case DiscImageChef.CommonTypes.DiskType.DOS_35_SS_DD_9: - case DiscImageChef.CommonTypes.DiskType.DOS_35_DS_DD_8: - case DiscImageChef.CommonTypes.DiskType.DOS_35_DS_DD_9: - case DiscImageChef.CommonTypes.DiskType.DOS_35_HD: - case DiscImageChef.CommonTypes.DiskType.DOS_35_ED: - case DiscImageChef.CommonTypes.DiskType.DMF: - case DiscImageChef.CommonTypes.DiskType.DMF_82: - case DiscImageChef.CommonTypes.DiskType.XDF_35: - case DiscImageChef.CommonTypes.DiskType.ACORN_35_DS_DD: - case DiscImageChef.CommonTypes.DiskType.CBM_35_DD: - case DiscImageChef.CommonTypes.DiskType.CBM_AMIGA_35_DD: - case DiscImageChef.CommonTypes.DiskType.CBM_AMIGA_35_HD: - case DiscImageChef.CommonTypes.DiskType.ECMA_100: - case DiscImageChef.CommonTypes.DiskType.ECMA_125: - case DiscImageChef.CommonTypes.DiskType.ECMA_147: - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_35_DD: - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_35_HD: - case DiscImageChef.CommonTypes.DiskType.NEC_35_HD_8: - case DiscImageChef.CommonTypes.DiskType.NEC_35_HD_15: - case DiscImageChef.CommonTypes.DiskType.SHARP_35: + case CommonTypes.MediaType.AppleSonySS: + case CommonTypes.MediaType.AppleSonyDS: + 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_35: + case CommonTypes.MediaType.ACORN_35_DS_DD: + case CommonTypes.MediaType.CBM_35_DD: + case CommonTypes.MediaType.CBM_AMIGA_35_DD: + case CommonTypes.MediaType.CBM_AMIGA_35_HD: + case CommonTypes.MediaType.ECMA_100: + case CommonTypes.MediaType.ECMA_125: + case CommonTypes.MediaType.ECMA_147: + case CommonTypes.MediaType.FDFORMAT_35_DD: + case CommonTypes.MediaType.FDFORMAT_35_HD: + case CommonTypes.MediaType.NEC_35_HD_8: + case CommonTypes.MediaType.NEC_35_HD_15: + case CommonTypes.MediaType.SHARP_35: // According to ECMA-100 et al dmns.Height = 94; dmns.HeightSpecified = true; @@ -123,24 +122,24 @@ namespace DiscImageChef.Metadata #endregion 3.5" floppy disk #region 8" floppy disk - case DiscImageChef.CommonTypes.DiskType.IBM23FD: - case DiscImageChef.CommonTypes.DiskType.IBM33FD_128: - case DiscImageChef.CommonTypes.DiskType.IBM33FD_256: - case DiscImageChef.CommonTypes.DiskType.IBM33FD_512: - case DiscImageChef.CommonTypes.DiskType.IBM43FD_128: - case DiscImageChef.CommonTypes.DiskType.IBM43FD_256: - case DiscImageChef.CommonTypes.DiskType.IBM53FD_256: - case DiscImageChef.CommonTypes.DiskType.IBM53FD_512: - case DiscImageChef.CommonTypes.DiskType.IBM53FD_1024: - case DiscImageChef.CommonTypes.DiskType.RX01: - case DiscImageChef.CommonTypes.DiskType.RX02: - case DiscImageChef.CommonTypes.DiskType.NEC_8_SD: - case DiscImageChef.CommonTypes.DiskType.NEC_8_DD: - case DiscImageChef.CommonTypes.DiskType.ECMA_54: - case DiscImageChef.CommonTypes.DiskType.ECMA_59: - case DiscImageChef.CommonTypes.DiskType.ECMA_69_8: - case DiscImageChef.CommonTypes.DiskType.ECMA_69_15: - case DiscImageChef.CommonTypes.DiskType.ECMA_69_26: + 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: + case CommonTypes.MediaType.IBM53FD_256: + case CommonTypes.MediaType.IBM53FD_512: + case CommonTypes.MediaType.IBM53FD_1024: + case CommonTypes.MediaType.RX01: + case CommonTypes.MediaType.RX02: + case CommonTypes.MediaType.NEC_8_SD: + case CommonTypes.MediaType.NEC_8_DD: + case CommonTypes.MediaType.ECMA_54: + case CommonTypes.MediaType.ECMA_59: + case CommonTypes.MediaType.ECMA_69_8: + case CommonTypes.MediaType.ECMA_69_15: + case CommonTypes.MediaType.ECMA_69_26: // According to ECMA-59 et al dmns.Height = 203.2; dmns.HeightSpecified = true; @@ -151,10 +150,10 @@ namespace DiscImageChef.Metadata #endregion 8" floppy disk #region 5.25" magneto optical - case DiscImageChef.CommonTypes.DiskType.ECMA_183_512: - case DiscImageChef.CommonTypes.DiskType.ECMA_183_1024: - case DiscImageChef.CommonTypes.DiskType.ECMA_184_512: - case DiscImageChef.CommonTypes.DiskType.ECMA_184_1024: + case CommonTypes.MediaType.ECMA_183_512: + case CommonTypes.MediaType.ECMA_183_1024: + case CommonTypes.MediaType.ECMA_184_512: + case CommonTypes.MediaType.ECMA_184_1024: // According to ECMA-183 et al dmns.Height = 153; dmns.HeightSpecified = true; @@ -165,8 +164,8 @@ namespace DiscImageChef.Metadata #endregion 5.25" magneto optical #region 3.5" magneto optical - case DiscImageChef.CommonTypes.DiskType.ECMA_154: - case DiscImageChef.CommonTypes.DiskType.ECMA_201: + case CommonTypes.MediaType.ECMA_154: + case CommonTypes.MediaType.ECMA_201: // According to ECMA-154 et al dmns.Height = 94; dmns.HeightSpecified = true; diff --git a/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj b/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj index bf66571bc..db7e20438 100644 --- a/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj +++ b/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj @@ -38,8 +38,8 @@ cicm.cs - + diff --git a/DiscImageChef.Metadata/DiskType.cs b/DiscImageChef.Metadata/MediaType.cs similarity index 67% rename from DiscImageChef.Metadata/DiskType.cs rename to DiscImageChef.Metadata/MediaType.cs index b78cbf519..5b8553592 100644 --- a/DiscImageChef.Metadata/DiskType.cs +++ b/DiscImageChef.Metadata/MediaType.cs @@ -35,600 +35,599 @@ // Copyright (C) 2011-2015 Claunia.com // ****************************************************************************/ // //$Id$ -using System; namespace DiscImageChef.Metadata { - public static class DiskType + public static class MediaType { - public static void DiskTypeToString(CommonTypes.DiskType dskType, out string DiscType, out string DiscSubType) + public static void MediaTypeToString(CommonTypes.MediaType dskType, out string DiscType, out string DiscSubType) { switch (dskType) { - case CommonTypes.DiskType.BDR: + case CommonTypes.MediaType.BDR: DiscType = "BD"; DiscSubType = "BD-R"; break; - case CommonTypes.DiskType.BDRE: + case CommonTypes.MediaType.BDRE: DiscType = "BD"; DiscSubType = "BD-RE"; break; - case CommonTypes.DiskType.BDREXL: + case CommonTypes.MediaType.BDREXL: DiscType = "BD"; DiscSubType = "BD-RE XL"; break; - case CommonTypes.DiskType.BDROM: + case CommonTypes.MediaType.BDROM: DiscType = "BD"; DiscSubType = "BD-ROM"; break; - case CommonTypes.DiskType.BDRXL: + case CommonTypes.MediaType.BDRXL: DiscType = "BD"; DiscSubType = "BD-R XL"; break; - case CommonTypes.DiskType.CBHD: + case CommonTypes.MediaType.CBHD: DiscType = "BD"; DiscSubType = "CBHD"; break; - case CommonTypes.DiskType.CD: + case CommonTypes.MediaType.CD: DiscType = "CD"; DiscSubType = "CD"; break; - case CommonTypes.DiskType.CDDA: + case CommonTypes.MediaType.CDDA: DiscType = "CD"; DiscSubType = "CD Digital Audio"; break; - case CommonTypes.DiskType.CDEG: + case CommonTypes.MediaType.CDEG: DiscType = "CD"; DiscSubType = "CD+EG"; break; - case CommonTypes.DiskType.CDG: + case CommonTypes.MediaType.CDG: DiscType = "CD"; DiscSubType = "CD+G"; break; - case CommonTypes.DiskType.CDI: + case CommonTypes.MediaType.CDI: DiscType = "CD"; DiscSubType = "CD-i"; break; - case CommonTypes.DiskType.CDMIDI: + case CommonTypes.MediaType.CDMIDI: DiscType = "CD"; DiscSubType = "CD+MIDI"; break; - case CommonTypes.DiskType.CDMO: + case CommonTypes.MediaType.CDMO: DiscType = "CD"; DiscSubType = "CD-MO"; break; - case CommonTypes.DiskType.CDMRW: + case CommonTypes.MediaType.CDMRW: DiscType = "CD"; DiscSubType = "CD-MRW"; break; - case CommonTypes.DiskType.CDPLUS: + case CommonTypes.MediaType.CDPLUS: DiscType = "CD"; DiscSubType = "CD+"; break; - case CommonTypes.DiskType.CDR: + case CommonTypes.MediaType.CDR: DiscType = "CD"; DiscSubType = "CD-R"; break; - case CommonTypes.DiskType.CDROM: + case CommonTypes.MediaType.CDROM: DiscType = "CD"; DiscSubType = "CD-ROM"; break; - case CommonTypes.DiskType.CDROMXA: + case CommonTypes.MediaType.CDROMXA: DiscType = "CD"; DiscSubType = "CD-ROM XA"; break; - case CommonTypes.DiskType.CDRW: + case CommonTypes.MediaType.CDRW: DiscType = "CD"; DiscSubType = "CD-RW"; break; - case CommonTypes.DiskType.CDV: + case CommonTypes.MediaType.CDV: DiscType = "CD"; DiscSubType = "CD-Video"; break; - case CommonTypes.DiskType.DDCD: + case CommonTypes.MediaType.DDCD: DiscType = "DDCD"; DiscSubType = "DDCD"; break; - case CommonTypes.DiskType.DDCDR: + case CommonTypes.MediaType.DDCDR: DiscType = "DDCD"; DiscSubType = "DDCD-R"; break; - case CommonTypes.DiskType.DDCDRW: + case CommonTypes.MediaType.DDCDRW: DiscType = "DDCD"; DiscSubType = "DDCD-RW"; break; - case CommonTypes.DiskType.DTSCD: + case CommonTypes.MediaType.DTSCD: DiscType = "CD"; DiscSubType = "DTS CD"; break; - case CommonTypes.DiskType.DVDDownload: + case CommonTypes.MediaType.DVDDownload: DiscType = "DVD"; DiscSubType = "DVD-Download"; break; - case CommonTypes.DiskType.DVDPR: + case CommonTypes.MediaType.DVDPR: DiscType = "DVD"; DiscSubType = "DVD+R"; break; - case CommonTypes.DiskType.DVDPRDL: + case CommonTypes.MediaType.DVDPRDL: DiscType = "DVD"; DiscSubType = "DVD+R DL"; break; - case CommonTypes.DiskType.DVDPRW: + case CommonTypes.MediaType.DVDPRW: DiscType = "DVD"; DiscSubType = "DVD+RW"; break; - case CommonTypes.DiskType.DVDPRWDL: + case CommonTypes.MediaType.DVDPRWDL: DiscType = "DVD"; DiscSubType = "DVD+RW DL"; break; - case CommonTypes.DiskType.DVDR: + case CommonTypes.MediaType.DVDR: DiscType = "DVD"; DiscSubType = "DVD-R"; break; - case CommonTypes.DiskType.DVDRAM: + case CommonTypes.MediaType.DVDRAM: DiscType = "DVD"; DiscSubType = "DVD-RAM"; break; - case CommonTypes.DiskType.DVDRDL: + case CommonTypes.MediaType.DVDRDL: DiscType = "DVD"; DiscSubType = "DVD-R DL"; break; - case CommonTypes.DiskType.DVDROM: + case CommonTypes.MediaType.DVDROM: DiscType = "DVD"; DiscSubType = "DVD-ROM"; break; - case CommonTypes.DiskType.DVDRW: + case CommonTypes.MediaType.DVDRW: DiscType = "DVD"; DiscSubType = "DVD-RW"; break; - case CommonTypes.DiskType.DVDRWDL: + case CommonTypes.MediaType.DVDRWDL: DiscType = "DVD"; DiscSubType = "DVD-RW"; break; - case CommonTypes.DiskType.EVD: + case CommonTypes.MediaType.EVD: DiscType = "EVD"; DiscSubType = "EVD"; break; - case CommonTypes.DiskType.FDDVD: + case CommonTypes.MediaType.FDDVD: DiscType = "FDDVD"; DiscSubType = "FDDVD"; break; - case CommonTypes.DiskType.FVD: + case CommonTypes.MediaType.FVD: DiscType = "FVD"; DiscSubType = "FVD"; break; - case CommonTypes.DiskType.GDR: + case CommonTypes.MediaType.GDR: DiscType = "GD"; DiscSubType = "GD-R"; break; - case CommonTypes.DiskType.GDROM: + case CommonTypes.MediaType.GDROM: DiscType = "GD"; DiscSubType = "GD-ROM"; break; - case CommonTypes.DiskType.GOD: + case CommonTypes.MediaType.GOD: DiscType = "DVD"; DiscSubType = "GameCube Game Disc"; break; - case CommonTypes.DiskType.WOD: + case CommonTypes.MediaType.WOD: DiscType = "DVD"; DiscSubType = "Wii Optical Disc"; break; - case CommonTypes.DiskType.WUOD: + case CommonTypes.MediaType.WUOD: DiscType = "BD"; DiscSubType = "Wii U Optical Disc"; break; - case CommonTypes.DiskType.HDDVDR: + case CommonTypes.MediaType.HDDVDR: DiscType = "HD DVD"; DiscSubType = "HD DVD-R"; break; - case CommonTypes.DiskType.HDDVDRAM: + case CommonTypes.MediaType.HDDVDRAM: DiscType = "HD DVD"; DiscSubType = "HD DVD-RAM"; break; - case CommonTypes.DiskType.HDDVDRDL: + case CommonTypes.MediaType.HDDVDRDL: DiscType = "HD DVD"; DiscSubType = "HD DVD-R DL"; break; - case CommonTypes.DiskType.HDDVDROM: + case CommonTypes.MediaType.HDDVDROM: DiscType = "HD DVD"; DiscSubType = "HD DVD-ROM"; break; - case CommonTypes.DiskType.HDDVDRW: + case CommonTypes.MediaType.HDDVDRW: DiscType = "HD DVD"; DiscSubType = "HD DVD-RW"; break; - case CommonTypes.DiskType.HDDVDRWDL: + case CommonTypes.MediaType.HDDVDRWDL: DiscType = "HD DVD"; DiscSubType = "HD DVD-RW DL"; break; - case CommonTypes.DiskType.HDVMD: + case CommonTypes.MediaType.HDVMD: DiscType = "HD VMD"; DiscSubType = "HD VMD"; break; - case CommonTypes.DiskType.HiMD: + case CommonTypes.MediaType.HiMD: DiscType = "MiniDisc"; DiscSubType = "HiMD"; break; - case CommonTypes.DiskType.HVD: + case CommonTypes.MediaType.HVD: DiscType = "HVD"; DiscSubType = "HVD"; break; - case CommonTypes.DiskType.LD: + case CommonTypes.MediaType.LD: DiscType = "LaserDisc"; DiscSubType = "LaserDisc"; break; - case CommonTypes.DiskType.LDROM: + case CommonTypes.MediaType.LDROM: DiscType = "LaserDisc"; DiscSubType = "LD-ROM"; break; - case CommonTypes.DiskType.MD: + case CommonTypes.MediaType.MD: DiscType = "MiniDisc"; DiscSubType = "MiniDisc"; break; - case CommonTypes.DiskType.MEGACD: + case CommonTypes.MediaType.MEGACD: DiscType = "CD"; DiscSubType = "Sega Mega CD"; break; - case CommonTypes.DiskType.PCD: + case CommonTypes.MediaType.PCD: DiscType = "CD"; DiscSubType = "Photo CD"; break; - case CommonTypes.DiskType.PS1CD: + case CommonTypes.MediaType.PS1CD: DiscType = "CD"; DiscSubType = "PlayStation Game Disc"; break; - case CommonTypes.DiskType.PS2CD: + case CommonTypes.MediaType.PS2CD: DiscType = "CD"; DiscSubType = "PlayStation 2 Game Disc"; break; - case CommonTypes.DiskType.PS2DVD: + case CommonTypes.MediaType.PS2DVD: DiscType = "DVD"; DiscSubType = "PlayStation 2 Game Disc"; break; - case CommonTypes.DiskType.PS3BD: + case CommonTypes.MediaType.PS3BD: DiscType = "BD"; DiscSubType = "PlayStation 3 Game Disc"; break; - case CommonTypes.DiskType.PS3DVD: + case CommonTypes.MediaType.PS3DVD: DiscType = "DVD"; DiscSubType = "PlayStation 3 Game Disc"; break; - case CommonTypes.DiskType.PS4BD: + case CommonTypes.MediaType.PS4BD: DiscType = "BD"; DiscSubType = "PlayStation 4 Game Disc"; break; - case CommonTypes.DiskType.SACD: + case CommonTypes.MediaType.SACD: DiscType = "SACD"; DiscSubType = "Super Audio CD"; break; - case CommonTypes.DiskType.SATURNCD: + case CommonTypes.MediaType.SATURNCD: DiscType = "CD"; DiscSubType = "Sega Saturn CD"; break; - case CommonTypes.DiskType.SVCD: + case CommonTypes.MediaType.SVCD: DiscType = "CD"; DiscSubType = "Super Video CD"; break; - case CommonTypes.DiskType.SVOD: + case CommonTypes.MediaType.SVOD: DiscType = "SVOD"; DiscSubType = "SVOD"; break; - case CommonTypes.DiskType.UDO: + case CommonTypes.MediaType.UDO: DiscType = "UDO"; DiscSubType = "UDO"; break; - case CommonTypes.DiskType.UMD: + case CommonTypes.MediaType.UMD: DiscType = "UMD"; DiscSubType = "Universal Media Disc"; break; - case CommonTypes.DiskType.VCD: + case CommonTypes.MediaType.VCD: DiscType = "CD"; DiscSubType = "Video CD"; break; - case CommonTypes.DiskType.XGD: + case CommonTypes.MediaType.XGD: DiscType = "DVD"; DiscSubType = "Xbox Game Disc (XGD)"; break; - case CommonTypes.DiskType.XGD2: + case CommonTypes.MediaType.XGD2: DiscType = "DVD"; DiscSubType = "Xbox 360 Game Disc (XGD2)"; break; - case CommonTypes.DiskType.XGD3: + case CommonTypes.MediaType.XGD3: DiscType = "DVD"; DiscSubType = "Xbox 360 Game Disc (XGD3)"; break; - case CommonTypes.DiskType.XGD4: + case CommonTypes.MediaType.XGD4: DiscType = "BD"; DiscSubType = "Xbox One Game Disc (XGD4)"; break; - case DiscImageChef.CommonTypes.DiskType.Apple32SS: + case CommonTypes.MediaType.Apple32SS: DiscType = "5.25\" floppy"; DiscSubType = "Apple DOS 3.2"; break; - case DiscImageChef.CommonTypes.DiskType.Apple32DS: + case CommonTypes.MediaType.Apple32DS: DiscType = "5.25\" floppy"; DiscSubType = "Apple DOS 3.2 (double-sided)"; break; - case DiscImageChef.CommonTypes.DiskType.Apple33SS: + case CommonTypes.MediaType.Apple33SS: DiscType = "5.25\" floppy"; DiscSubType = "Apple DOS 3.3"; break; - case DiscImageChef.CommonTypes.DiskType.Apple33DS: + case CommonTypes.MediaType.Apple33DS: DiscType = "5.25\" floppy"; DiscSubType = "Apple DOS 3.3 (double-sided)"; break; - case DiscImageChef.CommonTypes.DiskType.AppleSonySS: + case CommonTypes.MediaType.AppleSonySS: DiscType = "3.5\" floppy"; DiscSubType = "Apple 400K"; break; - case DiscImageChef.CommonTypes.DiskType.AppleSonyDS: + case CommonTypes.MediaType.AppleSonyDS: DiscType = "3.5\" floppy"; DiscSubType = "Apple 800K"; break; - case DiscImageChef.CommonTypes.DiskType.AppleFileWare: + case CommonTypes.MediaType.AppleFileWare: DiscType = "5.25\" floppy"; DiscSubType = "Apple FileWare"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_525_SS_DD_8: + case CommonTypes.MediaType.DOS_525_SS_DD_8: DiscType = "5.25\" floppy"; DiscSubType = "IBM double-density, single-sided, 8 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_525_SS_DD_9: + case CommonTypes.MediaType.DOS_525_SS_DD_9: DiscType = "5.25\" floppy"; DiscSubType = "IBM double-density, single-sided, 9 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_525_DS_DD_8: + case CommonTypes.MediaType.DOS_525_DS_DD_8: DiscType = "5.25\" floppy"; DiscSubType = "IBM double-density, double-sided, 8 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_525_DS_DD_9: + case CommonTypes.MediaType.DOS_525_DS_DD_9: DiscType = "5.25\" floppy"; DiscSubType = "IBM double-density, double-sided, 9 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_525_HD: + case CommonTypes.MediaType.DOS_525_HD: DiscType = "5.25\" floppy"; DiscSubType = "IBM high-density"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_35_SS_DD_8: + case CommonTypes.MediaType.DOS_35_SS_DD_8: DiscType = "3.5\" floppy"; DiscSubType = "IBM double-density, single-sided, 8 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_35_SS_DD_9: + case CommonTypes.MediaType.DOS_35_SS_DD_9: DiscType = "3.5\" floppy"; DiscSubType = "IBM double-density, single-sided, 9 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_35_DS_DD_8: + case CommonTypes.MediaType.DOS_35_DS_DD_8: DiscType = "3.5\" floppy"; DiscSubType = "IBM double-density, double-sided, 8 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_35_DS_DD_9: + case CommonTypes.MediaType.DOS_35_DS_DD_9: DiscType = "3.5\" floppy"; DiscSubType = "IBM double-density, double-sided, 9 sectors"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_35_HD: + case CommonTypes.MediaType.DOS_35_HD: DiscType = "3.5\" floppy"; DiscSubType = "IBM high-density"; break; - case DiscImageChef.CommonTypes.DiskType.DOS_35_ED: + case CommonTypes.MediaType.DOS_35_ED: DiscType = "3.5\" floppy"; DiscSubType = "IBM extra-density"; break; - case DiscImageChef.CommonTypes.DiskType.DMF: + case CommonTypes.MediaType.DMF: DiscType = "3.5\" floppy"; DiscSubType = "Microsoft DMF"; break; - case DiscImageChef.CommonTypes.DiskType.DMF_82: + case CommonTypes.MediaType.DMF_82: DiscType = "3.5\" floppy"; DiscSubType = "Microsoft DMF (82-track)"; break; - case DiscImageChef.CommonTypes.DiskType.XDF_35: + case CommonTypes.MediaType.XDF_35: DiscType = "3.5\" floppy"; DiscSubType = "IBM XDF"; break; - case DiscImageChef.CommonTypes.DiskType.XDF_525: + case CommonTypes.MediaType.XDF_525: DiscType = "5.25\" floppy"; DiscSubType = "IBM XDF"; break; - case DiscImageChef.CommonTypes.DiskType.IBM23FD: + case CommonTypes.MediaType.IBM23FD: DiscType = "8\" floppy"; DiscSubType = "IBM 23FD"; break; - case DiscImageChef.CommonTypes.DiskType.IBM33FD_128: + case CommonTypes.MediaType.IBM33FD_128: DiscType = "8\" floppy"; DiscSubType = "IBM 33FD (128 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.IBM33FD_256: + case CommonTypes.MediaType.IBM33FD_256: DiscType = "8\" floppy"; DiscSubType = "IBM 33FD (256 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.IBM33FD_512: + case CommonTypes.MediaType.IBM33FD_512: DiscType = "8\" floppy"; DiscSubType = "IBM 33FD (512 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.IBM43FD_128: + case CommonTypes.MediaType.IBM43FD_128: DiscType = "8\" floppy"; DiscSubType = "IBM 43FD (128 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.IBM43FD_256: + case CommonTypes.MediaType.IBM43FD_256: DiscType = "8\" floppy"; DiscSubType = "IBM 43FD (256 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.IBM53FD_256: + case CommonTypes.MediaType.IBM53FD_256: DiscType = "8\" floppy"; DiscSubType = "IBM 53FD (256 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.IBM53FD_512: + case CommonTypes.MediaType.IBM53FD_512: DiscType = "8\" floppy"; DiscSubType = "IBM 53FD (512 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.IBM53FD_1024: + case CommonTypes.MediaType.IBM53FD_1024: DiscType = "8\" floppy"; DiscSubType = "IBM 53FD (1024 bytes/sector)"; break; - case DiscImageChef.CommonTypes.DiskType.RX01: + case CommonTypes.MediaType.RX01: DiscType = "8\" floppy"; DiscSubType = "DEC RX-01"; break; - case DiscImageChef.CommonTypes.DiskType.RX02: + case CommonTypes.MediaType.RX02: DiscType = "8\" floppy"; DiscSubType = "DEC RX-02"; break; - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_SD_40: + case CommonTypes.MediaType.ACORN_525_SS_SD_40: DiscType = "5.25\" floppy"; DiscSubType = "BBC Micro 100K"; break; - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_SD_80: + case CommonTypes.MediaType.ACORN_525_SS_SD_80: DiscType = "5.25\" floppy"; DiscSubType = "BBC Micro 200K"; break; - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_DD_40: + case CommonTypes.MediaType.ACORN_525_SS_DD_40: DiscType = "5.25\" floppy"; DiscSubType = "Acorn S"; break; - case DiscImageChef.CommonTypes.DiskType.ACORN_525_SS_DD_80: + case CommonTypes.MediaType.ACORN_525_SS_DD_80: DiscType = "5.25\" floppy"; DiscSubType = "Acorn M"; break; - case DiscImageChef.CommonTypes.DiskType.ACORN_525_DS_DD: + case CommonTypes.MediaType.ACORN_525_DS_DD: DiscType = "5.25\" floppy"; DiscSubType = "Acorn L"; break; - case DiscImageChef.CommonTypes.DiskType.ACORN_35_DS_DD: + case CommonTypes.MediaType.ACORN_35_DS_DD: DiscType = "3.5\" floppy"; DiscSubType = "Acorn Archimedes"; break; - case DiscImageChef.CommonTypes.DiskType.ATARI_525_SD: + case CommonTypes.MediaType.ATARI_525_SD: DiscType = "5.25\" floppy"; DiscSubType = "Atari single-density"; break; - case DiscImageChef.CommonTypes.DiskType.ATARI_525_ED: + case CommonTypes.MediaType.ATARI_525_ED: DiscType = "5.25\" floppy"; DiscSubType = "Atari enhanced-density"; break; - case DiscImageChef.CommonTypes.DiskType.ATARI_525_DD: + case CommonTypes.MediaType.ATARI_525_DD: DiscType = "5.25\" floppy"; DiscSubType = "Atari double-density"; break; - case DiscImageChef.CommonTypes.DiskType.CBM_1540: + case CommonTypes.MediaType.CBM_1540: DiscType = "5.25\" floppy"; DiscSubType = "Commodore 1540/1541"; break; - case DiscImageChef.CommonTypes.DiskType.CBM_35_DD: + case CommonTypes.MediaType.CBM_35_DD: DiscType = "3.5\" floppy"; DiscSubType = "Commodore 1581"; break; - case DiscImageChef.CommonTypes.DiskType.CBM_AMIGA_35_DD: + case CommonTypes.MediaType.CBM_AMIGA_35_DD: DiscType = "3.5\" floppy"; DiscSubType = "Amiga double-density"; break; - case DiscImageChef.CommonTypes.DiskType.CBM_AMIGA_35_HD: + case CommonTypes.MediaType.CBM_AMIGA_35_HD: DiscType = "3.5\" floppy"; DiscSubType = "Amiga high-density"; break; - case DiscImageChef.CommonTypes.DiskType.NEC_8_SD: + case CommonTypes.MediaType.NEC_8_SD: DiscType = "8\" floppy"; DiscSubType = "NEC single-sided"; break; - case DiscImageChef.CommonTypes.DiskType.NEC_8_DD: + case CommonTypes.MediaType.NEC_8_DD: DiscType = "8\" floppy"; DiscSubType = "NEC double-sided"; break; - case DiscImageChef.CommonTypes.DiskType.NEC_525_HD: + case CommonTypes.MediaType.NEC_525_HD: DiscType = "5.25\" floppy"; DiscSubType = "NEC high-density"; break; - case DiscImageChef.CommonTypes.DiskType.NEC_35_HD_8: + case CommonTypes.MediaType.NEC_35_HD_8: DiscType = "3.5\" floppy"; DiscSubType = "NEC high-density"; break; - case DiscImageChef.CommonTypes.DiskType.NEC_35_HD_15: + case CommonTypes.MediaType.NEC_35_HD_15: DiscType = "3.5\" floppy"; DiscSubType = "NEC floppy mode 3"; break; - case DiscImageChef.CommonTypes.DiskType.SHARP_525: + case CommonTypes.MediaType.SHARP_525: DiscType = "5.25\" floppy"; DiscSubType = "Sharp"; break; - case DiscImageChef.CommonTypes.DiskType.SHARP_35: + case CommonTypes.MediaType.SHARP_35: DiscType = "3.5\" floppy"; DiscSubType = "Sharp"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_54: + case CommonTypes.MediaType.ECMA_54: DiscType = "8\" floppy"; DiscSubType = "ECMA-54"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_59: + case CommonTypes.MediaType.ECMA_59: DiscType = "8\" floppy"; DiscSubType = "ECMA-59"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_69_8: - case DiscImageChef.CommonTypes.DiskType.ECMA_69_15: - case DiscImageChef.CommonTypes.DiskType.ECMA_69_26: + case CommonTypes.MediaType.ECMA_69_8: + case CommonTypes.MediaType.ECMA_69_15: + case CommonTypes.MediaType.ECMA_69_26: DiscType = "8\" floppy"; DiscSubType = "ECMA-69"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_66: + case CommonTypes.MediaType.ECMA_66: DiscType = "5.25\" floppy"; DiscSubType = "ECMA-66"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_70: + case CommonTypes.MediaType.ECMA_70: DiscType = "5.25\" floppy"; DiscSubType = "ECMA-70"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_78: - case DiscImageChef.CommonTypes.DiskType.ECMA_78_2: + case CommonTypes.MediaType.ECMA_78: + case CommonTypes.MediaType.ECMA_78_2: DiscType = "5.25\" floppy"; DiscSubType = "ECMA-78"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_99_8: - case DiscImageChef.CommonTypes.DiskType.ECMA_99_15: - case DiscImageChef.CommonTypes.DiskType.ECMA_99_26: + case CommonTypes.MediaType.ECMA_99_8: + case CommonTypes.MediaType.ECMA_99_15: + case CommonTypes.MediaType.ECMA_99_26: DiscType = "5.25\" floppy"; DiscSubType = "ECMA-99"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_100: + case CommonTypes.MediaType.ECMA_100: DiscType = "3.5\" floppy"; DiscSubType = "ECMA-99"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_125: + case CommonTypes.MediaType.ECMA_125: DiscType = "3.5\" floppy"; DiscSubType = "ECMA-125"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_147: + case CommonTypes.MediaType.ECMA_147: DiscType = "3.5\" floppy"; DiscSubType = "ECMA-147"; break; - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_525_DD: + case CommonTypes.MediaType.FDFORMAT_525_DD: DiscType = "5.25\" floppy"; DiscSubType = "FDFORMAT double-density"; break; - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_525_HD: + case CommonTypes.MediaType.FDFORMAT_525_HD: DiscType = "5.25\" floppy"; DiscSubType = "FDFORMAT high-density"; break; - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_35_DD: + case CommonTypes.MediaType.FDFORMAT_35_DD: DiscType = "3.5\" floppy"; DiscSubType = "FDFORMAT double-density"; break; - case DiscImageChef.CommonTypes.DiskType.FDFORMAT_35_HD: + case CommonTypes.MediaType.FDFORMAT_35_HD: DiscType = "3.5\" floppy"; DiscSubType = "FDFORMAT high-density"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_183_512: - case DiscImageChef.CommonTypes.DiskType.ECMA_183_1024: + case CommonTypes.MediaType.ECMA_183_512: + case CommonTypes.MediaType.ECMA_183_1024: DiscType = "5.25\" magneto-optical"; DiscSubType = "ECMA-183"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_184_512: - case DiscImageChef.CommonTypes.DiskType.ECMA_184_1024: + case CommonTypes.MediaType.ECMA_184_512: + case CommonTypes.MediaType.ECMA_184_1024: DiscType = "5.25\" magneto-optical"; DiscSubType = "ECMA-184"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_154: + case CommonTypes.MediaType.ECMA_154: DiscType = "3.5\" magneto-optical"; DiscSubType = "ECMA-154"; break; - case DiscImageChef.CommonTypes.DiskType.ECMA_201: + case CommonTypes.MediaType.ECMA_201: DiscType = "3.5\" magneto-optical"; DiscSubType = "ECMA-201"; break; diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 776cd2e9d..ae90c9d1f 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,13 @@ +2016-01-16 Natalia Portillo + + * 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 * Commands/CreateSidecar.cs: diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs index 3832ae6de..821fef5f8 100644 --- a/DiscImageChef/Commands/Analyze.cs +++ b/DiscImageChef/Commands/Analyze.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) { diff --git a/DiscImageChef/Commands/Compare.cs b/DiscImageChef/Commands/Compare.cs index 95c869159..93d64837c 100644 --- a/DiscImageChef/Commands/Compare.cs +++ b/DiscImageChef/Commands/Compare.cs @@ -117,8 +117,8 @@ namespace DiscImageChef.Commands ImageInfo image2Info = new ImageInfo(); List image1Sessions = new List(); List image2Sessions = new List(); - Dictionary image1DiskTags = new Dictionary(); - Dictionary image2DiskTags = new Dictionary(); + Dictionary image1DiskTags = new Dictionary(); + Dictionary image2DiskTags = new Dictionary(); 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) diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs index 785b4c149..0001ea655 100644 --- a/DiscImageChef/Commands/CreateSidecar.cs +++ b/DiscImageChef/Commands/CreateSidecar.cs @@ -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; } diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs index 699b5987c..818cfa8df 100644 --- a/DiscImageChef/Commands/Decode.cs +++ b/DiscImageChef/Commands/Decode.cs @@ -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 diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs index 08b0f325c..1b6436e36 100644 --- a/DiscImageChef/Commands/MediaInfo.cs +++ b/DiscImageChef/Commands/MediaInfo.cs @@ -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; } } } diff --git a/DiscImageChef/Commands/Verify.cs b/DiscImageChef/Commands/Verify.cs index 4d7c5bac2..ec6c4c87f 100644 --- a/DiscImageChef/Commands/Verify.cs +++ b/DiscImageChef/Commands/Verify.cs @@ -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;