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

REFACTOR: Fixed MOST name inconsistencies.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-20 17:15:26 +00:00
parent 542520f5cd
commit a4650c61aa
428 changed files with 16205 additions and 16320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
DiscImageChef.DiscImages/RayDIM.cs
View File

@@ -39,9 +39,9 @@ using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
namespace DiscImageChef.ImagePlugins
namespace DiscImageChef.DiscImages
{
public class RayDIM : ImagePlugin
public class RayDim : ImagePlugin
{
#region Internal Structures
[StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -64,7 +64,7 @@ namespace DiscImageChef.ImagePlugins
}
#endregion
readonly string DimSignatureRegEx =
const string DIM_SIGNATURE_REGEX =
"Disk IMage VER (?<major>\\d).(?<minor>\\d) Copyright \\(C\\) (?<year>\\d{4}) Ray Arachelian, All Rights Reserved\\."
;
@@ -72,29 +72,29 @@ namespace DiscImageChef.ImagePlugins
MemoryStream disk;
#endregion
public RayDIM()
public RayDim()
{
Name = "Ray Arachelian's Disk IMage";
PluginUUID = new Guid("F541F4E7-C1E3-4A2D-B07F-D863E87AB961");
PluginUuid = new Guid("F541F4E7-C1E3-4A2D-B07F-D863E87AB961");
ImageInfo = new ImageInfo();
ImageInfo.readableSectorTags = new List<SectorTagType>();
ImageInfo.readableMediaTags = new List<MediaTagType>();
ImageInfo.imageHasPartitions = false;
ImageInfo.imageHasSessions = false;
ImageInfo.imageApplication = "Ray Arachelian's Disk IMage";
ImageInfo.imageCreator = null;
ImageInfo.imageComments = null;
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;
ImageInfo.driveFirmwareRevision = null;
ImageInfo.ReadableSectorTags = new List<SectorTagType>();
ImageInfo.ReadableMediaTags = new List<MediaTagType>();
ImageInfo.ImageHasPartitions = false;
ImageInfo.ImageHasSessions = false;
ImageInfo.ImageApplication = "Ray Arachelian's Disk IMage";
ImageInfo.ImageCreator = null;
ImageInfo.ImageComments = null;
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;
ImageInfo.DriveFirmwareRevision = null;
}
public override bool IdentifyImage(Filter imageFilter)
@@ -122,7 +122,7 @@ namespace DiscImageChef.ImagePlugins
DicConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.sectorsPerTrack = {0}",
header.sectorsPerTrack);
Regex sx = new Regex(DimSignatureRegEx);
Regex sx = new Regex(DIM_SIGNATURE_REGEX);
Match sm = sx.Match(signature);
DicConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.signature matches? = {0}",
@@ -149,83 +149,83 @@ namespace DiscImageChef.ImagePlugins
string signature = StringHandlers.CToString(header.signature);
Regex sx = new Regex(DimSignatureRegEx);
Regex sx = new Regex(DIM_SIGNATURE_REGEX);
Match sm = sx.Match(signature);
if(!sm.Success) return false;
ImageInfo.imageApplicationVersion =
ImageInfo.ImageApplicationVersion =
string.Format("{0}.{1}", sm.Groups["major"].Value, sm.Groups["minor"].Value);
ImageInfo.cylinders = (uint)(header.cylinders + 1);
ImageInfo.heads = (uint)(header.heads + 1);
ImageInfo.sectorsPerTrack = header.sectorsPerTrack;
ImageInfo.sectors = ImageInfo.cylinders * ImageInfo.heads * ImageInfo.sectorsPerTrack;
ImageInfo.sectorSize = 512;
ImageInfo.Cylinders = (uint)(header.cylinders + 1);
ImageInfo.Heads = (uint)(header.heads + 1);
ImageInfo.SectorsPerTrack = header.sectorsPerTrack;
ImageInfo.Sectors = ImageInfo.Cylinders * ImageInfo.Heads * ImageInfo.SectorsPerTrack;
ImageInfo.SectorSize = 512;
byte[] sectors = new byte[ImageInfo.sectorsPerTrack * ImageInfo.sectorSize];
byte[] sectors = new byte[ImageInfo.SectorsPerTrack * ImageInfo.SectorSize];
disk = new MemoryStream();
for(int i = 0; i < ImageInfo.sectorsPerTrack * ImageInfo.sectorSize; i++)
for(int i = 0; i < ImageInfo.SectorsPerTrack * ImageInfo.SectorSize; i++)
{
stream.Read(sectors, 0, sectors.Length);
stream.Seek(ImageInfo.sectorsPerTrack, SeekOrigin.Current);
stream.Seek(ImageInfo.SectorsPerTrack, SeekOrigin.Current);
disk.Write(sectors, 0, sectors.Length);
}
switch(header.diskType)
{
case RayDiskTypes.Md2hd:
if(ImageInfo.heads == 2 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 15)
ImageInfo.mediaType = MediaType.DOS_525_HD;
if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 15)
ImageInfo.MediaType = MediaType.DOS_525_HD;
else goto case RayDiskTypes.Md2dd;
break;
case RayDiskTypes.Md2dd:
if(ImageInfo.heads == 1 && ImageInfo.cylinders == 40 && ImageInfo.sectorsPerTrack == 8)
ImageInfo.mediaType = MediaType.DOS_525_SS_DD_8;
else if(ImageInfo.heads == 1 && ImageInfo.cylinders == 40 && ImageInfo.sectorsPerTrack == 9)
ImageInfo.mediaType = MediaType.DOS_525_SS_DD_9;
else if(ImageInfo.heads == 2 && ImageInfo.cylinders == 40 && ImageInfo.sectorsPerTrack == 8)
ImageInfo.mediaType = MediaType.DOS_525_DS_DD_8;
else if(ImageInfo.heads == 2 && ImageInfo.cylinders == 40 && ImageInfo.sectorsPerTrack == 9)
ImageInfo.mediaType = MediaType.DOS_525_DS_DD_9;
else ImageInfo.mediaType = MediaType.Unknown;
if(ImageInfo.Heads == 1 && ImageInfo.Cylinders == 40 && ImageInfo.SectorsPerTrack == 8)
ImageInfo.MediaType = MediaType.DOS_525_SS_DD_8;
else if(ImageInfo.Heads == 1 && ImageInfo.Cylinders == 40 && ImageInfo.SectorsPerTrack == 9)
ImageInfo.MediaType = MediaType.DOS_525_SS_DD_9;
else if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 40 && ImageInfo.SectorsPerTrack == 8)
ImageInfo.MediaType = MediaType.DOS_525_DS_DD_8;
else if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 40 && ImageInfo.SectorsPerTrack == 9)
ImageInfo.MediaType = MediaType.DOS_525_DS_DD_9;
else ImageInfo.MediaType = MediaType.Unknown;
break;
case RayDiskTypes.Mf2ed:
if(ImageInfo.heads == 2 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 36)
ImageInfo.mediaType = MediaType.DOS_35_ED;
if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 36)
ImageInfo.MediaType = MediaType.DOS_35_ED;
else goto case RayDiskTypes.Mf2hd;
break;
case RayDiskTypes.Mf2hd:
if(ImageInfo.heads == 2 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 18)
ImageInfo.mediaType = MediaType.DOS_35_HD;
else if(ImageInfo.heads == 2 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 21)
ImageInfo.mediaType = MediaType.DMF;
else if(ImageInfo.heads == 2 && ImageInfo.cylinders == 82 && ImageInfo.sectorsPerTrack == 21)
ImageInfo.mediaType = MediaType.DMF_82;
else if(ImageInfo.heads == 2 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 15)
ImageInfo.mediaType = MediaType.NEC_35_HD_15;
if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 18)
ImageInfo.MediaType = MediaType.DOS_35_HD;
else if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 21)
ImageInfo.MediaType = MediaType.DMF;
else if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 82 && ImageInfo.SectorsPerTrack == 21)
ImageInfo.MediaType = MediaType.DMF_82;
else if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 15)
ImageInfo.MediaType = MediaType.NEC_35_HD_15;
else goto case RayDiskTypes.Mf2dd;
break;
case RayDiskTypes.Mf2dd:
if(ImageInfo.heads == 2 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 9)
ImageInfo.mediaType = MediaType.DOS_35_DS_DD_9;
else if(ImageInfo.heads == 2 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 8)
ImageInfo.mediaType = MediaType.DOS_35_DS_DD_8;
else if(ImageInfo.heads == 1 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 9)
ImageInfo.mediaType = MediaType.DOS_35_SS_DD_9;
else if(ImageInfo.heads == 1 && ImageInfo.cylinders == 80 && ImageInfo.sectorsPerTrack == 8)
ImageInfo.mediaType = MediaType.DOS_35_SS_DD_8;
else if(ImageInfo.heads == 1 && ImageInfo.cylinders == 70 && ImageInfo.sectorsPerTrack == 9)
ImageInfo.mediaType = MediaType.Apricot_35;
else ImageInfo.mediaType = MediaType.Unknown;
if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 9)
ImageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
else if(ImageInfo.Heads == 2 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 8)
ImageInfo.MediaType = MediaType.DOS_35_DS_DD_8;
else if(ImageInfo.Heads == 1 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 9)
ImageInfo.MediaType = MediaType.DOS_35_SS_DD_9;
else if(ImageInfo.Heads == 1 && ImageInfo.Cylinders == 80 && ImageInfo.SectorsPerTrack == 8)
ImageInfo.MediaType = MediaType.DOS_35_SS_DD_8;
else if(ImageInfo.Heads == 1 && ImageInfo.Cylinders == 70 && ImageInfo.SectorsPerTrack == 9)
ImageInfo.MediaType = MediaType.Apricot_35;
else ImageInfo.MediaType = MediaType.Unknown;
break;
default:
ImageInfo.mediaType = MediaType.Unknown;
ImageInfo.MediaType = MediaType.Unknown;
break;
}
ImageInfo.xmlMediaType = XmlMediaType.BlockMedia;
ImageInfo.XmlMediaType = XmlMediaType.BlockMedia;
return true;
}
@@ -240,24 +240,24 @@ namespace DiscImageChef.ImagePlugins
return null;
}
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>();
failingLbas = new List<ulong>();
unknownLbas = new List<ulong>();
for(ulong i = sectorAddress; i < sectorAddress + length; i++) UnknownLBAs.Add(i);
for(ulong i = sectorAddress; i < sectorAddress + length; 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)
{
FailingLBAs = new List<ulong>();
UnknownLBAs = new List<ulong>();
failingLbas = new List<ulong>();
unknownLbas = new List<ulong>();
for(ulong i = sectorAddress; i < sectorAddress + length; i++) UnknownLBAs.Add(i);
for(ulong i = sectorAddress; i < sectorAddress + length; i++) unknownLbas.Add(i);
return null;
}
@@ -269,22 +269,22 @@ namespace DiscImageChef.ImagePlugins
public override bool ImageHasPartitions()
{
return ImageInfo.imageHasPartitions;
return ImageInfo.ImageHasPartitions;
}
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 byte[] ReadSector(ulong sectorAddress)
@@ -299,16 +299,16 @@ 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];
disk.Seek((long)(sectorAddress * ImageInfo.sectorSize), SeekOrigin.Begin);
disk.Read(buffer, 0, (int)(length * ImageInfo.sectorSize));
disk.Seek((long)(sectorAddress * ImageInfo.SectorSize), SeekOrigin.Begin);
disk.Read(buffer, 0, (int)(length * ImageInfo.SectorSize));
return buffer;
}
@@ -335,37 +335,37 @@ 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 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 MediaType GetMediaType()
{
return ImageInfo.mediaType;
return ImageInfo.MediaType;
}
#region Unsupported features
@@ -376,62 +376,62 @@ namespace DiscImageChef.ImagePlugins
public override string GetImageCreator()
{
return ImageInfo.imageCreator;
return ImageInfo.ImageCreator;
}
public override string GetImageComments()
{
return ImageInfo.imageComments;
return ImageInfo.ImageComments;
}
public override string GetMediaManufacturer()
{
return ImageInfo.mediaManufacturer;
return ImageInfo.MediaManufacturer;
}
public override string GetMediaModel()
{
return ImageInfo.mediaModel;
return ImageInfo.MediaModel;
}
public override string GetMediaSerialNumber()
{
return ImageInfo.mediaSerialNumber;
return ImageInfo.MediaSerialNumber;
}
public override string GetMediaBarcode()
{
return ImageInfo.mediaBarcode;
return ImageInfo.MediaBarcode;
}
public override string GetMediaPartNumber()
{
return ImageInfo.mediaPartNumber;
return ImageInfo.MediaPartNumber;
}
public override int GetMediaSequence()
{
return ImageInfo.mediaSequence;
return ImageInfo.MediaSequence;
}
public override int GetLastDiskSequence()
{
return ImageInfo.lastMediaSequence;
return ImageInfo.LastMediaSequence;
}
public override string GetDriveManufacturer()
{
return ImageInfo.driveManufacturer;
return ImageInfo.DriveManufacturer;
}
public override string GetDriveModel()
{
return ImageInfo.driveModel;
return ImageInfo.DriveModel;
}
public override string GetDriveSerialNumber()
{
return ImageInfo.driveSerialNumber;
return ImageInfo.DriveSerialNumber;
}
public override List<Partition> GetPartitions()