aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor most disk references to media.

Browse Source
This commit is contained in:
Natalia Portillo
2016-01-16 03:54:55 +00:00
parent e1243a1ea3
commit 22b0f80d6e
28 changed files with 975 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
DiscImageChef.DiscImages/Apple2MG.cs
View File

@@ -177,7 +177,7 @@ namespace DiscImageChef.ImagePlugins
PluginUUID = new Guid("CBAF8824-BA5F-415F-953A-19A03519B2D1");
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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;
}

72
DiscImageChef.DiscImages/CDRDAO.cs
View File

@@ -128,7 +128,7 @@ namespace DiscImageChef.ImagePlugins
/// <summary>Media catalog number</summary>
public string mcn;
/// <summary>Disk type</summary>
public DiskType disktype;
public MediaType disktype;
/// <summary>Disk type string</summary>
public string disktypestr;
/// <summary>Disk CDDB ID</summary>
@@ -222,18 +222,18 @@ namespace DiscImageChef.ImagePlugins
imagePath = "";
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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<Partition> 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()

124
DiscImageChef.DiscImages/CDRWin.cs
View File

@@ -127,7 +127,7 @@ namespace DiscImageChef.ImagePlugins
/// <summary>Media catalog number</summary>
public string mcn;
/// <summary>Disk type</summary>
public DiskType disktype;
public MediaType disktype;
/// <summary>Disk type string</summary>
public string disktypestr;
/// <summary>Disk CDDB ID</summary>
@@ -297,18 +297,18 @@ namespace DiscImageChef.ImagePlugins
imagePath = "";
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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<CommonTypes.Partition> 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()

15
DiscImageChef.DiscImages/ChangeLog
View File

@@ -1,3 +1,18 @@
2016-01-16 Natalia Portillo <claunia@claunia.com>
* 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 <claunia@claunia.com>
* ImagePlugin.cs:

64
DiscImageChef.DiscImages/DiskCopy42.cs
View File

@@ -134,7 +134,7 @@ namespace DiscImageChef.ImagePlugins
PluginUUID = new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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()

52
DiscImageChef.DiscImages/GDI.cs
View File

@@ -81,7 +81,7 @@ namespace DiscImageChef.ImagePlugins
/// <summary>Tracks</summary>
public List<GDITrack> tracks;
/// <summary>Disk type</summary>
public DiskType disktype;
public MediaType disktype;
}
#endregion Internal structures
@@ -114,18 +114,18 @@ namespace DiscImageChef.ImagePlugins
imagePath = "";
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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<Partition> 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()

18
DiscImageChef.DiscImages/ImageInfo.cs
View File

@@ -11,7 +11,7 @@ namespace DiscImageChef.ImagePlugins
public UInt64 imageSize;
public UInt64 sectors;
public UInt32 sectorSize;
public List<DiskTagType> readableDiskTags;
public List<MediaTagType> readableMediaTags;
public List<SectorTagType> 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;

56
DiscImageChef.DiscImages/ImagePlugin.cs
View File

@@ -107,7 +107,7 @@ namespace DiscImageChef.ImagePlugins
/// </summary>
/// <returns>Disk tag</returns>
/// <param name="tag">Tag type to read.</param>
public abstract byte[] ReadDiskTag(DiskTagType tag);
public abstract byte[] ReadDiskTag(MediaTagType tag);
/// <summary>
/// Reads a sector's user data.
@@ -268,51 +268,51 @@ namespace DiscImageChef.ImagePlugins
// Functions to get information from disk represented by image
/// <summary>
/// Gets the disk manufacturer.
/// Gets the media manufacturer.
/// </summary>
/// <returns>The disk manufacturer.</returns>
public abstract string GetDiskManufacturer();
/// <returns>The media manufacturer.</returns>
public abstract string GetMediaManufacturer();
/// <summary>
/// Gets the disk model.
/// Gets the media model.
/// </summary>
/// <returns>The disk model.</returns>
public abstract string GetDiskModel();
/// <returns>The media model.</returns>
public abstract string GetMediaModel();
/// <summary>
/// Gets the disk serial number.
/// Gets the media serial number.
/// </summary>
/// <returns>The disk serial number.</returns>
public abstract string GetDiskSerialNumber();
/// <returns>The media serial number.</returns>
public abstract string GetMediaSerialNumber();
/// <summary>
/// Gets the disk (or product) barcode.
/// Gets the media (or product) barcode.
/// </summary>
/// <returns>The disk barcode.</returns>
public abstract string GetDiskBarcode();
/// <returns>The media barcode.</returns>
public abstract string GetMediaBarcode();
/// <summary>
/// Gets the disk part number.
/// Gets the media part number.
/// </summary>
/// <returns>The disk part number.</returns>
public abstract string GetDiskPartNumber();
/// <returns>The media part number.</returns>
public abstract string GetMediaPartNumber();
/// <summary>
/// Gets the type of the disk.
/// Gets the type of the media.
/// </summary>
/// <returns>The disk type.</returns>
public abstract DiskType GetDiskType();
/// <returns>The media type.</returns>
public abstract MediaType GetMediaType();
/// <summary>
/// Gets the disk sequence.
/// Gets the media sequence.
/// </summary>
/// <returns>The disk sequence, starting at 1.</returns>
public abstract int GetDiskSequence();
/// <returns>The media sequence, starting at 1.</returns>
public abstract int GetMediaSequence();
/// <summary>
/// Gets the last disk in the sequence.
/// Gets the last media in the sequence.
/// </summary>
/// <returns>The last disk in the sequence.</returns>
/// <returns>The last media in the sequence.</returns>
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<UInt64> FailingLBAs, out List<UInt64> UnknownLBAs);
/// <summary>
/// Verifies disk image internal checksum.
/// Verifies media image internal checksum.
/// </summary>
/// <returns>True if correct, false if incorrect, null if there is no internal checksum available</returns>
public abstract bool? VerifyDiskImage();
public abstract bool? VerifyMediaImage();
// CD flags bitmask
@@ -563,9 +563,9 @@ namespace DiscImageChef.ImagePlugins
};
/// <summary>
/// Metadata present for each disk.
/// Metadata present for each media.
/// </summary>
public enum DiskTagType
public enum MediaTagType
{
/// <summary>CD table of contents</summary>
CD_TOC,

96
DiscImageChef.DiscImages/Nero.cs
View File

@@ -871,7 +871,7 @@ namespace DiscImageChef.ImagePlugins
imageNewFormat = false;
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
neroSessions = new Dictionary<ushort, UInt32>();
neroTracks = new Dictionary<uint, NeroTrack>();
offsetmap = new Dictionary<uint, ulong>();
@@ -975,7 +975,7 @@ namespace DiscImageChef.ImagePlugins
imageTracks = new List<Track>();
TrackISRCs = new Dictionary<uint, byte[]>();
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<NeroV1DAOEntry>();
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<NeroV2DAOEntry>();
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<CommonTypes.Partition> 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");
}

170
DiscImageChef.DiscImages/TeleDisk.cs
View File

@@ -211,19 +211,19 @@ namespace DiscImageChef.ImagePlugins
PluginUUID = new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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()

36
DiscImageChef.DiscImages/VHD.cs
View File

@@ -373,7 +373,7 @@ namespace DiscImageChef.ImagePlugins
PluginUUID = new Guid("8014d88f-64cd-4484-9441-7635c632958a");
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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;
}

194
DiscImageChef.DiscImages/ZZZRawImage.cs
View File

@@ -60,7 +60,7 @@ namespace DiscImageChef.ImagePlugins
PluginUUID = new Guid("12345678-AAAA-BBBB-CCCC-123456789000");
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableDiskTags = new List<DiskTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
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()