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

General cleanup and refactor.

Browse Source
This commit is contained in:
Natalia Portillo
2022-03-07 07:36:44 +00:00
parent bc6e432565
commit 762e3eb6d2
1321 changed files with 44657 additions and 45479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Aaru.Images/WCDiskImage/Identify.cs
View File

@@ -31,13 +31,13 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System.IO;
using System.Text;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
namespace Aaru.DiscImages;
public sealed partial class WCDiskImage
{
/// <inheritdoc />
@@ -49,7 +49,7 @@ public sealed partial class WCDiskImage
if(stream.Length < 32)
return false;
byte[] header = new byte[32];
var header = new byte[32];
stream.Read(header, 0, 32);
FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);

6
Aaru.Images/WCDiskImage/Properties.cs
View File

@@ -31,13 +31,13 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.Collections.Generic;
using Aaru.CommonTypes.Structs;
using Schemas;
namespace Aaru.DiscImages;
public sealed partial class WCDiskImage
{
/// <inheritdoc />
@@ -46,7 +46,7 @@ public sealed partial class WCDiskImage
/// <inheritdoc />
public string Name => "d2f disk image";
/// <inheritdoc />
public Guid Id => new Guid("DDE01493-BCA2-41C2-A269-7E56D3716D2F");
public Guid Id => new("DDE01493-BCA2-41C2-A269-7E56D3716D2F");
/// <inheritdoc />
public string Author => "Michael Drüing";
/// <inheritdoc />

28
Aaru.Images/WCDiskImage/Read.cs
View File

@@ -31,6 +31,8 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.IO;
using System.Text;
@@ -41,8 +43,6 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
namespace Aaru.DiscImages;
public sealed partial class WCDiskImage
{
/// <inheritdoc />
@@ -52,7 +52,7 @@ public sealed partial class WCDiskImage
Stream stream = imageFilter.GetDataForkStream();
stream.Seek(0, SeekOrigin.Begin);
byte[] header = new byte[32];
var header = new byte[32];
stream.Read(header, 0, 32);
FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);
@@ -79,11 +79,11 @@ public sealed partial class WCDiskImage
false));
/* buffer the entire disk in memory */
for(int cyl = 0; cyl < _imageInfo.Cylinders; cyl++)
for(var cyl = 0; cyl < _imageInfo.Cylinders; cyl++)
{
for(int head = 0; head < _imageInfo.Heads; head++)
for(var head = 0; head < _imageInfo.Heads; head++)
{
var errno =ReadTrack(stream, cyl, head);
ErrorNumber errno = ReadTrack(stream, cyl, head);
if(errno != ErrorNumber.NoError)
return errno;
@@ -128,7 +128,7 @@ public sealed partial class WCDiskImage
if(fheader.extraFlags.HasFlag(ExtraFlag.Comment))
{
AaruConsole.DebugWriteLine("d2f plugin", "Comment present, reading");
byte[] sheaderBuffer = new byte[6];
var sheaderBuffer = new byte[6];
stream.Read(sheaderBuffer, 0, 6);
SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
@@ -140,7 +140,7 @@ public sealed partial class WCDiskImage
return ErrorNumber.InvalidArgument;
}
byte[] comm = new byte[sheader.crc];
var comm = new byte[sheader.crc];
stream.Read(comm, 0, sheader.crc);
comments += Encoding.ASCII.GetString(comm) + Environment.NewLine;
}
@@ -148,7 +148,7 @@ public sealed partial class WCDiskImage
if(fheader.extraFlags.HasFlag(ExtraFlag.Directory))
{
AaruConsole.DebugWriteLine("d2f plugin", "Directory listing present, reading");
byte[] sheaderBuffer = new byte[6];
var sheaderBuffer = new byte[6];
stream.Read(sheaderBuffer, 0, 6);
SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
@@ -160,7 +160,7 @@ public sealed partial class WCDiskImage
return ErrorNumber.InvalidArgument;
}
byte[] dir = new byte[sheader.crc];
var dir = new byte[sheader.crc];
stream.Read(dir, 0, sheader.crc);
comments += Encoding.ASCII.GetString(dir);
}
@@ -179,7 +179,7 @@ public sealed partial class WCDiskImage
public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
{
int sectorNumber = (int)(sectorAddress % _imageInfo.SectorsPerTrack) + 1;
int trackNumber = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
var trackNumber = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
int headNumber = _imageInfo.Heads > 1 ? trackNumber % 2 : 0;
int cylinderNumber = _imageInfo.Heads > 1 ? trackNumber / 2 : trackNumber;
@@ -245,10 +245,10 @@ public sealed partial class WCDiskImage
byte[] crc;
short calculatedCRC;
for(int sect = 1; sect < _imageInfo.SectorsPerTrack + 1; sect++)
for(var sect = 1; sect < _imageInfo.SectorsPerTrack + 1; sect++)
{
/* read the sector header */
byte[] sheaderBuffer = new byte[6];
var sheaderBuffer = new byte[6];
stream.Read(sheaderBuffer, 0, 6);
SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
@@ -299,7 +299,7 @@ public sealed partial class WCDiskImage
AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: RepeatByte sector, fill byte 0x{0:x2}",
cyl, head, sect, sheader.crc & 0xff);
*/
for(int i = 0; i < 512; i++)
for(var i = 0; i < 512; i++)
sectorData[i] = (byte)(sheader.crc & 0xff);
_sectorCache[(cyl, head, sect)] = sectorData;

4
Aaru.Images/WCDiskImage/Structs.cs
View File

@@ -31,10 +31,10 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
using System.Runtime.InteropServices;
namespace Aaru.DiscImages;
using System.Runtime.InteropServices;
public sealed partial class WCDiskImage
{
/// <summary>The expected signature of a proper image file.</summary>

4
Aaru.Images/WCDiskImage/Unsupported.cs
View File

@@ -30,10 +30,10 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
using Aaru.CommonTypes.Enums;
namespace Aaru.DiscImages;
using Aaru.CommonTypes.Enums;
public sealed partial class WCDiskImage
{
/// <inheritdoc />

10
Aaru.Images/WCDiskImage/WCDiskImage.cs
View File

@@ -31,28 +31,26 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
namespace Aaru.DiscImages;
/// <inheritdoc />
/// <summary>Manages floppy disk images created with d2f by DataPackRat</summary>
[SuppressMessage("ReSharper", "NotAccessedField.Local"), SuppressMessage("ReSharper", "InconsistentNaming")]
public sealed partial class WCDiskImage : IMediaImage
{
readonly Dictionary<(int cylinder, int head, int sector), bool> _badSectors =
new Dictionary<(int cylinder, int head, int sector), bool>();
readonly Dictionary<(int cylinder, int head, int sector), bool> _badSectors = new();
/// <summary>The file header after the image has been opened</summary>
FileHeader _fileHeader;
ImageInfo _imageInfo;
/* the sectors are cached here */
readonly Dictionary<(int cylinder, int head, int sector), byte[]> _sectorCache =
new Dictionary<(int cylinder, int head, int sector), byte[]>();
readonly Dictionary<(int cylinder, int head, int sector), byte[]> _sectorCache = new();
/// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
IFilter _wcImageFilter;