REFACTOR: Fixed MOST name inconsistencies.

This commit is contained in:
2017-12-20 17:15:26 +00:00
parent 542520f5cd
commit a4650c61aa
428 changed files with 16205 additions and 16320 deletions

View File

@@ -38,7 +38,7 @@ using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
namespace DiscImageChef.ImagePlugins
namespace DiscImageChef.DiscImages
{
public class Anex86 : ImagePlugin
{
@@ -60,29 +60,29 @@ namespace DiscImageChef.ImagePlugins
public Anex86()
{
Name = "Anex86 Disk Image";
PluginUUID = new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
PluginUuid = new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
ImageInfo = new ImageInfo()
{
readableSectorTags = new List<SectorTagType>(),
readableMediaTags = new List<MediaTagType>(),
imageHasPartitions = false,
imageHasSessions = false,
imageVersion = null,
imageApplication = null,
imageApplicationVersion = null,
imageCreator = null,
imageComments = null,
mediaManufacturer = null,
mediaModel = null,
mediaSerialNumber = null,
mediaBarcode = null,
mediaPartNumber = null,
mediaSequence = 0,
lastMediaSequence = 0,
driveManufacturer = null,
driveModel = null,
driveSerialNumber = null,
driveFirmwareRevision = null
ReadableSectorTags = new List<SectorTagType>(),
ReadableMediaTags = new List<MediaTagType>(),
ImageHasPartitions = false,
ImageHasSessions = false,
ImageVersion = null,
ImageApplication = null,
ImageApplicationVersion = null,
ImageCreator = null,
ImageComments = null,
MediaManufacturer = null,
MediaModel = null,
MediaSerialNumber = null,
MediaBarcode = null,
MediaPartNumber = null,
MediaSequence = 0,
LastMediaSequence = 0,
DriveManufacturer = null,
DriveModel = null,
DriveSerialNumber = null,
DriveFirmwareRevision = null
};
}
@@ -98,10 +98,10 @@ namespace DiscImageChef.ImagePlugins
if(stream.Length < Marshal.SizeOf(fdihdr)) return false;
byte[] hdr_b = new byte[Marshal.SizeOf(fdihdr)];
stream.Read(hdr_b, 0, hdr_b.Length);
byte[] hdrB = new byte[Marshal.SizeOf(fdihdr)];
stream.Read(hdrB, 0, hdrB.Length);
GCHandle handle = GCHandle.Alloc(hdr_b, GCHandleType.Pinned);
GCHandle handle = GCHandle.Alloc(hdrB, GCHandleType.Pinned);
fdihdr = (Anex86Header)Marshal.PtrToStructure(handle.AddrOfPinnedObject(), typeof(Anex86Header));
handle.Free();
@@ -127,14 +127,14 @@ namespace DiscImageChef.ImagePlugins
if(stream.Length < Marshal.SizeOf(fdihdr)) return false;
byte[] hdr_b = new byte[Marshal.SizeOf(fdihdr)];
stream.Read(hdr_b, 0, hdr_b.Length);
byte[] hdrB = new byte[Marshal.SizeOf(fdihdr)];
stream.Read(hdrB, 0, hdrB.Length);
GCHandle handle = GCHandle.Alloc(hdr_b, GCHandleType.Pinned);
GCHandle handle = GCHandle.Alloc(hdrB, GCHandleType.Pinned);
fdihdr = (Anex86Header)Marshal.PtrToStructure(handle.AddrOfPinnedObject(), typeof(Anex86Header));
handle.Free();
ImageInfo.mediaType = MediaType.GENERIC_HDD;
ImageInfo.MediaType = MediaType.GENERIC_HDD;
switch(fdihdr.cylinders)
{
@@ -145,12 +145,12 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 8:
if(fdihdr.heads == 1) ImageInfo.mediaType = MediaType.DOS_525_SS_DD_8;
else if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.DOS_525_DS_DD_8;
if(fdihdr.heads == 1) ImageInfo.MediaType = MediaType.DOS_525_SS_DD_8;
else if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.DOS_525_DS_DD_8;
break;
case 9:
if(fdihdr.heads == 1) ImageInfo.mediaType = MediaType.DOS_525_SS_DD_9;
else if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.DOS_525_DS_DD_9;
if(fdihdr.heads == 1) ImageInfo.MediaType = MediaType.DOS_525_SS_DD_9;
else if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.DOS_525_DS_DD_9;
break;
}
@@ -165,7 +165,7 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 9:
if(fdihdr.heads == 1) ImageInfo.mediaType = MediaType.Apricot_35;
if(fdihdr.heads == 1) ImageInfo.MediaType = MediaType.Apricot_35;
break;
}
@@ -180,7 +180,7 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 26:
if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.NEC_8_SD;
if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.NEC_8_SD;
break;
}
@@ -189,7 +189,7 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 26:
if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.NEC_8_DD;
if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.NEC_8_DD;
break;
}
@@ -198,7 +198,7 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 8:
if(fdihdr.heads == 1) ImageInfo.mediaType = MediaType.Apricot_35;
if(fdihdr.heads == 1) ImageInfo.MediaType = MediaType.Apricot_35;
break;
}
@@ -207,7 +207,7 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 8:
if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.NEC_525_HD;
if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.NEC_525_HD;
break;
}
@@ -222,8 +222,8 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 16:
if(fdihdr.heads == 1) ImageInfo.mediaType = MediaType.NEC_525_SS;
else if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.NEC_525_DS;
if(fdihdr.heads == 1) ImageInfo.MediaType = MediaType.NEC_525_SS;
else if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.NEC_525_DS;
break;
}
@@ -232,21 +232,21 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 8:
if(fdihdr.heads == 1) ImageInfo.mediaType = MediaType.DOS_35_SS_DD_8;
else if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.DOS_35_DS_DD_8;
if(fdihdr.heads == 1) ImageInfo.MediaType = MediaType.DOS_35_SS_DD_8;
else if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.DOS_35_DS_DD_8;
break;
case 9:
if(fdihdr.heads == 1) ImageInfo.mediaType = MediaType.DOS_35_SS_DD_9;
else if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.DOS_35_DS_DD_9;
if(fdihdr.heads == 1) ImageInfo.MediaType = MediaType.DOS_35_SS_DD_9;
else if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
break;
case 15:
if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.NEC_35_HD_15;
if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.NEC_35_HD_15;
break;
case 18:
if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.DOS_35_HD;
if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.DOS_35_HD;
break;
case 36:
if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.DOS_35_ED;
if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.DOS_35_ED;
break;
}
@@ -261,7 +261,7 @@ namespace DiscImageChef.ImagePlugins
switch(fdihdr.spt)
{
case 38:
if(fdihdr.heads == 2) ImageInfo.mediaType = MediaType.NEC_35_TD;
if(fdihdr.heads == 2) ImageInfo.MediaType = MediaType.NEC_35_TD;
break;
}
@@ -271,18 +271,18 @@ namespace DiscImageChef.ImagePlugins
break;
}
DicConsole.DebugWriteLine("Anex86 plugin", "MediaType: {0}", ImageInfo.mediaType);
DicConsole.DebugWriteLine("Anex86 plugin", "MediaType: {0}", ImageInfo.MediaType);
ImageInfo.imageSize = (ulong)fdihdr.dskSize;
ImageInfo.imageCreationTime = imageFilter.GetCreationTime();
ImageInfo.imageLastModificationTime = imageFilter.GetLastWriteTime();
ImageInfo.imageName = Path.GetFileNameWithoutExtension(imageFilter.GetFilename());
ImageInfo.sectors = (ulong)(fdihdr.cylinders * fdihdr.heads * fdihdr.spt);
ImageInfo.xmlMediaType = XmlMediaType.BlockMedia;
ImageInfo.sectorSize = (uint)fdihdr.bps;
ImageInfo.cylinders = (uint)fdihdr.cylinders;
ImageInfo.heads = (uint)fdihdr.heads;
ImageInfo.sectorsPerTrack = (uint)fdihdr.spt;
ImageInfo.ImageSize = (ulong)fdihdr.dskSize;
ImageInfo.ImageCreationTime = imageFilter.GetCreationTime();
ImageInfo.ImageLastModificationTime = imageFilter.GetLastWriteTime();
ImageInfo.ImageName = Path.GetFileNameWithoutExtension(imageFilter.GetFilename());
ImageInfo.Sectors = (ulong)(fdihdr.cylinders * fdihdr.heads * fdihdr.spt);
ImageInfo.XmlMediaType = XmlMediaType.BlockMedia;
ImageInfo.SectorSize = (uint)fdihdr.bps;
ImageInfo.Cylinders = (uint)fdihdr.cylinders;
ImageInfo.Heads = (uint)fdihdr.heads;
ImageInfo.SectorsPerTrack = (uint)fdihdr.spt;
anexImageFilter = imageFilter;
@@ -296,17 +296,17 @@ namespace DiscImageChef.ImagePlugins
public override ulong GetImageSize()
{
return ImageInfo.imageSize;
return ImageInfo.ImageSize;
}
public override ulong GetSectors()
{
return ImageInfo.sectors;
return ImageInfo.Sectors;
}
public override uint GetSectorSize()
{
return ImageInfo.sectorSize;
return ImageInfo.SectorSize;
}
public override string GetImageFormat()
@@ -316,47 +316,47 @@ namespace DiscImageChef.ImagePlugins
public override string GetImageVersion()
{
return ImageInfo.imageVersion;
return ImageInfo.ImageVersion;
}
public override string GetImageApplication()
{
return ImageInfo.imageApplication;
return ImageInfo.ImageApplication;
}
public override string GetImageApplicationVersion()
{
return ImageInfo.imageApplicationVersion;
return ImageInfo.ImageApplicationVersion;
}
public override string GetImageCreator()
{
return ImageInfo.imageCreator;
return ImageInfo.ImageCreator;
}
public override DateTime GetImageCreationTime()
{
return ImageInfo.imageCreationTime;
return ImageInfo.ImageCreationTime;
}
public override DateTime GetImageLastModificationTime()
{
return ImageInfo.imageLastModificationTime;
return ImageInfo.ImageLastModificationTime;
}
public override string GetImageName()
{
return ImageInfo.imageName;
return ImageInfo.ImageName;
}
public override string GetImageComments()
{
return ImageInfo.imageComments;
return ImageInfo.ImageComments;
}
public override MediaType GetMediaType()
{
return ImageInfo.mediaType;
return ImageInfo.MediaType;
}
public override byte[] ReadSector(ulong sectorAddress)
@@ -366,19 +366,19 @@ namespace DiscImageChef.ImagePlugins
public override byte[] ReadSectors(ulong sectorAddress, uint length)
{
if(sectorAddress > ImageInfo.sectors - 1)
if(sectorAddress > ImageInfo.Sectors - 1)
throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
if(sectorAddress + length > ImageInfo.sectors)
if(sectorAddress + length > ImageInfo.Sectors)
throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
byte[] buffer = new byte[length * ImageInfo.sectorSize];
byte[] buffer = new byte[length * ImageInfo.SectorSize];
Stream stream = anexImageFilter.GetDataForkStream();
stream.Seek((long)((ulong)fdihdr.hdrSize + sectorAddress * ImageInfo.sectorSize), SeekOrigin.Begin);
stream.Seek((long)((ulong)fdihdr.hdrSize + sectorAddress * ImageInfo.SectorSize), SeekOrigin.Begin);
stream.Read(buffer, 0, (int)(length * ImageInfo.sectorSize));
stream.Read(buffer, 0, (int)(length * ImageInfo.SectorSize));
return buffer;
}
@@ -524,18 +524,18 @@ namespace DiscImageChef.ImagePlugins
throw new FeatureUnsupportedImageException("Feature not supported by image format");
}
public override bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> FailingLBAs,
out List<ulong> UnknownLBAs)
public override bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
out List<ulong> unknownLbas)
{
FailingLBAs = new List<ulong>();
UnknownLBAs = new List<ulong>();
for(ulong i = 0; i < ImageInfo.sectors; i++) UnknownLBAs.Add(i);
failingLbas = new List<ulong>();
unknownLbas = new List<ulong>();
for(ulong i = 0; i < ImageInfo.Sectors; i++) unknownLbas.Add(i);
return null;
}
public override bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> FailingLBAs,
out List<ulong> UnknownLBAs)
public override bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
out List<ulong> unknownLbas)
{
throw new FeatureUnsupportedImageException("Feature not supported by image format");
}