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

Naming fixes.

Browse Source
This commit is contained in:
Natalia Portillo
2020-07-20 21:11:32 +01:00
parent c58c0fd1f8
commit 6220425ac6
525 changed files with 15675 additions and 15524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Aaru.Images/MaxiDisk/MaxiDisk.cs
View File

@@ -41,11 +41,11 @@ namespace Aaru.DiscImages
public partial class MaxiDisk : IWritableImage
{
/// <summary>Disk image file</summary>
IFilter hdkImageFilter;
ImageInfo imageInfo;
FileStream writingStream;
IFilter _hdkImageFilter;
ImageInfo _imageInfo;
FileStream _writingStream;
public MaxiDisk() => imageInfo = new ImageInfo
public MaxiDisk() => _imageInfo = new ImageInfo
{
ReadableSectorTags = new List<SectorTagType>(),
ReadableMediaTags = new List<MediaTagType>(),

2
Aaru.Images/MaxiDisk/Properties.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.DiscImages
{
public partial class MaxiDisk
{
public ImageInfo Info => imageInfo;
public ImageInfo Info => _imageInfo;
public string Author => "Natalia Portillo";
public string Name => "MAXI Disk image";
public Guid Id => new Guid("D27D924A-7034-466E-ADE1-B81EF37E469E");

38
Aaru.Images/MaxiDisk/Read.cs
View File

@@ -78,23 +78,23 @@ namespace Aaru.DiscImages
if(expectedFileSize != stream.Length)
return false;
imageInfo.Cylinders = tmpHeader.cylinders;
imageInfo.Heads = tmpHeader.heads;
imageInfo.SectorsPerTrack = tmpHeader.sectorsPerTrack;
imageInfo.Sectors = (ulong)(tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack);
imageInfo.SectorSize = (uint)(128 << tmpHeader.bytesPerSector);
_imageInfo.Cylinders = tmpHeader.cylinders;
_imageInfo.Heads = tmpHeader.heads;
_imageInfo.SectorsPerTrack = tmpHeader.sectorsPerTrack;
_imageInfo.Sectors = (ulong)(tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack);
_imageInfo.SectorSize = (uint)(128 << tmpHeader.bytesPerSector);
hdkImageFilter = imageFilter;
_hdkImageFilter = imageFilter;
imageInfo.ImageSize = (ulong)(stream.Length - 8);
imageInfo.CreationTime = imageFilter.GetCreationTime();
imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
_imageInfo.ImageSize = (ulong)(stream.Length - 8);
_imageInfo.CreationTime = imageFilter.GetCreationTime();
_imageInfo.LastModificationTime = imageFilter.GetLastWriteTime();
imageInfo.MediaType = Geometry.GetMediaType(((ushort)imageInfo.Cylinders, (byte)imageInfo.Heads,
(ushort)imageInfo.SectorsPerTrack, imageInfo.SectorSize,
MediaEncoding.MFM, false));
_imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
(ushort)_imageInfo.SectorsPerTrack, _imageInfo.SectorSize,
MediaEncoding.MFM, false));
imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
_imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
return true;
}
@@ -103,17 +103,17 @@ namespace Aaru.DiscImages
public 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 = hdkImageFilter.GetDataForkStream();
stream.Seek((long)(8 + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
Stream stream = _hdkImageFilter.GetDataForkStream();
stream.Seek((long)(8 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
return buffer;
}

46
Aaru.Images/MaxiDisk/Write.cs
View File

@@ -72,7 +72,7 @@ namespace Aaru.DiscImages
(ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
imageInfo = new ImageInfo
_imageInfo = new ImageInfo
{
MediaType = mediaType,
SectorSize = sectorSize,
@@ -82,14 +82,14 @@ namespace Aaru.DiscImages
SectorsPerTrack = geometry.sectorsPerTrack
};
if(imageInfo.Cylinders > 90)
if(_imageInfo.Cylinders > 90)
{
ErrorMessage = "Too many cylinders";
return false;
}
if(imageInfo.Heads > 2)
if(_imageInfo.Heads > 2)
{
ErrorMessage = "Too many heads";
@@ -98,7 +98,7 @@ namespace Aaru.DiscImages
try
{
writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
_writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
}
catch(IOException e)
{
@@ -136,17 +136,17 @@ namespace Aaru.DiscImages
return false;
}
if(sectorAddress >= imageInfo.Sectors)
if(sectorAddress >= _imageInfo.Sectors)
{
ErrorMessage = "Tried to write past image size";
return false;
}
writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + (sectorAddress * imageInfo.SectorSize)),
SeekOrigin.Begin);
_writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + (sectorAddress * _imageInfo.SectorSize)),
SeekOrigin.Begin);
writingStream.Write(data, 0, data.Length);
_writingStream.Write(data, 0, data.Length);
ErrorMessage = "";
@@ -169,17 +169,17 @@ namespace Aaru.DiscImages
return false;
}
if(sectorAddress + length > imageInfo.Sectors)
if(sectorAddress + length > _imageInfo.Sectors)
{
ErrorMessage = "Tried to write past image size";
return false;
}
writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + (sectorAddress * imageInfo.SectorSize)),
SeekOrigin.Begin);
_writingStream.Seek((long)((ulong)Marshal.SizeOf<HdkHeader>() + (sectorAddress * _imageInfo.SectorSize)),
SeekOrigin.Begin);
writingStream.Write(data, 0, data.Length);
_writingStream.Write(data, 0, data.Length);
ErrorMessage = "";
@@ -212,12 +212,12 @@ namespace Aaru.DiscImages
var header = new HdkHeader
{
diskType = (byte)HdkDiskTypes.Dos2880,
cylinders = (byte)imageInfo.Cylinders,
heads = (byte)imageInfo.Heads,
sectorsPerTrack = (byte)imageInfo.SectorsPerTrack
cylinders = (byte)_imageInfo.Cylinders,
heads = (byte)_imageInfo.Heads,
sectorsPerTrack = (byte)_imageInfo.SectorsPerTrack
};
for(uint i = imageInfo.SectorSize / 128; i > 1;)
for(uint i = _imageInfo.SectorSize / 128; i > 1;)
{
header.bytesPerSector++;
i >>= 1;
@@ -229,11 +229,11 @@ namespace Aaru.DiscImages
System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
writingStream.Seek(0, SeekOrigin.Begin);
writingStream.Write(hdr, 0, hdr.Length);
_writingStream.Seek(0, SeekOrigin.Begin);
_writingStream.Write(hdr, 0, hdr.Length);
writingStream.Flush();
writingStream.Close();
_writingStream.Flush();
_writingStream.Close();
IsWriting = false;
ErrorMessage = "";
@@ -266,9 +266,9 @@ namespace Aaru.DiscImages
return false;
}
imageInfo.SectorsPerTrack = sectorsPerTrack;
imageInfo.Heads = heads;
imageInfo.Cylinders = cylinders;
_imageInfo.SectorsPerTrack = sectorsPerTrack;
_imageInfo.Heads = heads;
_imageInfo.Cylinders = cylinders;
return true;
}