Rename Aaru.Console project to Aaru.Logging.

This commit is contained in:
2025-08-17 05:50:25 +01:00
parent 1a6f7a02c6
commit 02ec8a05d8
365 changed files with 5465 additions and 5347 deletions

View File

@@ -9,8 +9,8 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.Images;
@@ -59,9 +59,9 @@ public class AtariLynx : IByteAddressableImage
if((stream.Length - 64) % 65536 != 0) return false;
stream.Position = 0;
var magicBytes = new byte[4];
byte[] magicBytes = new byte[4];
stream.EnsureRead(magicBytes, 0, 4);
var magic = BitConverter.ToUInt32(magicBytes, 0);
uint magic = BitConverter.ToUInt32(magicBytes, 0);
// "LYNX"
return magic == 0x584E594C;
@@ -78,13 +78,13 @@ public class AtariLynx : IByteAddressableImage
if((stream.Length - 64) % 65536 != 0) return ErrorNumber.InvalidArgument;
stream.Position = 0x0;
var magicBytes = new byte[4];
byte[] magicBytes = new byte[4];
stream.EnsureRead(magicBytes, 0, 4);
var magic = BitConverter.ToUInt32(magicBytes, 0);
uint magic = BitConverter.ToUInt32(magicBytes, 0);
if(magic != 0x584E594C) return ErrorNumber.InvalidArgument;
var headerBytes = new byte[64];
byte[] headerBytes = new byte[64];
stream.Position = 0;
stream.EnsureRead(headerBytes, 0, 64);
@@ -405,7 +405,7 @@ public class AtariLynx : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
bool foundRom = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)

View File

@@ -9,8 +9,8 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.Images;
@@ -59,9 +59,9 @@ public class GameBoy : IByteAddressableImage
if(stream.Length % 32768 != 0) return false;
stream.Position = 0x104;
var magicBytes = new byte[8];
byte[] magicBytes = new byte[8];
stream.EnsureRead(magicBytes, 0, 8);
var magic = BitConverter.ToUInt64(magicBytes, 0);
ulong magic = BitConverter.ToUInt64(magicBytes, 0);
return magic == 0x0B000DCC6666EDCE;
}
@@ -77,9 +77,9 @@ public class GameBoy : IByteAddressableImage
if(stream.Length % 512 != 0) return ErrorNumber.InvalidArgument;
stream.Position = 0x104;
var magicBytes = new byte[8];
byte[] magicBytes = new byte[8];
stream.EnsureRead(magicBytes, 0, 8);
var magic = BitConverter.ToUInt64(magicBytes, 0);
ulong magic = BitConverter.ToUInt64(magicBytes, 0);
if(magic != 0x0B000DCC6666EDCE) return ErrorNumber.InvalidArgument;
@@ -100,7 +100,7 @@ public class GameBoy : IByteAddressableImage
Header header = Marshal.ByteArrayToStructureBigEndian<Header>(_data, 0x100, Marshal.SizeOf<Header>());
var name = new byte[(header.Name[^1] & 0x80) == 0x80 ? 15 : 16];
byte[] name = new byte[(header.Name[^1] & 0x80) == 0x80 ? 15 : 16];
Array.Copy(header.Name, 0, name, 0, name.Length);
_imageInfo.MediaTitle = StringHandlers.CToString(name);
@@ -266,8 +266,8 @@ public class GameBoy : IByteAddressableImage
Header header = Marshal.ByteArrayToStructureBigEndian<Header>(_data, 0x100, Marshal.SizeOf<Header>());
var hasMapper = false;
var hasSaveRam = false;
bool hasMapper = false;
bool hasSaveRam = false;
string mapperManufacturer = null;
string mapperName = null;
@@ -486,7 +486,7 @@ public class GameBoy : IByteAddressableImage
if(header.SramSize > 0) hasSaveRam = true;
var devices = 1;
int devices = 1;
if(hasSaveRam) devices++;
@@ -618,9 +618,9 @@ public class GameBoy : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
var foundSaveRam = false;
var foundMapper = false;
bool foundRom = false;
bool foundSaveRam = false;
bool foundMapper = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)

View File

@@ -9,8 +9,8 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.Images;
@@ -59,9 +59,9 @@ public class GameBoyAdvance : IByteAddressableImage
if(stream.Length % 32768 != 0) return false;
stream.Position = 4;
var magicBytes = new byte[8];
byte[] magicBytes = new byte[8];
stream.EnsureRead(magicBytes, 0, 8);
var magic = BitConverter.ToUInt64(magicBytes, 0);
ulong magic = BitConverter.ToUInt64(magicBytes, 0);
return magic == 0x21A29A6951AEFF24;
}
@@ -77,9 +77,9 @@ public class GameBoyAdvance : IByteAddressableImage
if(stream.Length % 512 != 0) return ErrorNumber.InvalidArgument;
stream.Position = 4;
var magicBytes = new byte[8];
byte[] magicBytes = new byte[8];
stream.EnsureRead(magicBytes, 0, 8);
var magic = BitConverter.ToUInt64(magicBytes, 0);
ulong magic = BitConverter.ToUInt64(magicBytes, 0);
if(magic != 0x21A29A6951AEFF24) return ErrorNumber.InvalidArgument;
@@ -353,8 +353,8 @@ public class GameBoyAdvance : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
var foundSaveRam = false;
bool foundRom = false;
bool foundSaveRam = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)

View File

@@ -9,8 +9,8 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.Images;
@@ -61,9 +61,9 @@ public class MasterSystem : IByteAddressableImage
if(stream.Length % 8192 != 0) return false;
stream.Position = 0x7ff0;
var magicBytes = new byte[8];
byte[] magicBytes = new byte[8];
stream.EnsureRead(magicBytes, 0, 8);
var magic = BitConverter.ToUInt64(magicBytes, 0);
ulong magic = BitConverter.ToUInt64(magicBytes, 0);
if(magic == 0x4147455320524D54) return true;
@@ -95,9 +95,9 @@ public class MasterSystem : IByteAddressableImage
int headerPosition;
stream.Position = 0x7ff0;
var magicBytes = new byte[8];
byte[] magicBytes = new byte[8];
stream.EnsureRead(magicBytes, 0, 8);
var magic = BitConverter.ToUInt64(magicBytes, 0);
ulong magic = BitConverter.ToUInt64(magicBytes, 0);
if(magic != 0x0B000DCC6666EDCE)
headerPosition = 0x7ff0;
@@ -456,7 +456,7 @@ public class MasterSystem : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
bool foundRom = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)

View File

@@ -11,10 +11,10 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Database;
using Aaru.Database.Models;
using Aaru.Helpers;
using Aaru.Logging;
namespace Aaru.Images;
@@ -75,9 +75,9 @@ public class Nes : IByteAddressableImage
if(stream.Length < 16) return false;
stream.Position = 0;
var magicBytes = new byte[4];
byte[] magicBytes = new byte[4];
stream.EnsureRead(magicBytes, 0, 8);
var magic = BitConverter.ToUInt32(magicBytes, 0);
uint magic = BitConverter.ToUInt32(magicBytes, 0);
return magic == 0x1A53454E;
}
@@ -93,9 +93,9 @@ public class Nes : IByteAddressableImage
if(stream.Length < 16) return ErrorNumber.InvalidArgument;
stream.Position = 0;
var header = new byte[16];
byte[] header = new byte[16];
stream.EnsureRead(header, 0, 8);
var magic = BitConverter.ToUInt32(header, 0);
uint magic = BitConverter.ToUInt32(header, 0);
if(magic != 0x1A53454E) return ErrorNumber.InvalidArgument;
@@ -314,7 +314,7 @@ public class Nes : IByteAddressableImage
return false;
}
var header = new byte[16];
byte[] header = new byte[16];
if(_nesHeaderInfo is null)
{
@@ -464,7 +464,7 @@ public class Nes : IByteAddressableImage
List<LinearMemoryDevice> devices =
[
new LinearMemoryDevice
new()
{
Type = LinearMemoryType.ROM,
PhysicalAddress = new LinearMemoryAddressing
@@ -682,16 +682,16 @@ public class Nes : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
var foundChrRom = false;
var foundInstRom = false;
var foundProm = false;
var foundRam = false;
var foundChrRam = false;
var foundNvram = false;
var foundChrNvram = false;
var foundMapper = false;
var foundSubMapper = false;
bool foundRom = false;
bool foundChrRom = false;
bool foundInstRom = false;
bool foundProm = false;
bool foundRam = false;
bool foundChrRam = false;
bool foundNvram = false;
bool foundChrNvram = false;
bool foundMapper = false;
bool foundSubMapper = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)

View File

@@ -41,8 +41,8 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.Images;
@@ -99,9 +99,9 @@ public class Nintendo64 : IByteAddressableImage
if(stream.Length % 512 != 0) return false;
stream.Position = 0;
var magicBytes = new byte[4];
byte[] magicBytes = new byte[4];
stream.EnsureRead(magicBytes, 0, 4);
var magic = BitConverter.ToUInt32(magicBytes, 0);
uint magic = BitConverter.ToUInt32(magicBytes, 0);
return magic switch
{
@@ -128,9 +128,9 @@ public class Nintendo64 : IByteAddressableImage
if(stream.Length % 512 != 0) return ErrorNumber.InvalidArgument;
stream.Position = 0;
var magicBytes = new byte[4];
byte[] magicBytes = new byte[4];
stream.EnsureRead(magicBytes, 0, 4);
var magic = BitConverter.ToUInt32(magicBytes, 0);
uint magic = BitConverter.ToUInt32(magicBytes, 0);
switch(magic)
{
@@ -179,9 +179,9 @@ public class Nintendo64 : IByteAddressableImage
if(_littleEndian)
{
var tmp = new byte[_data.Length];
byte[] tmp = new byte[_data.Length];
for(var i = 0; i < _data.Length; i += 4)
for(int i = 0; i < _data.Length; i += 4)
{
tmp[i] = _data[i + 3];
tmp[i + 1] = _data[i + 2];
@@ -194,9 +194,9 @@ public class Nintendo64 : IByteAddressableImage
if(_interleaved)
{
var tmp = new byte[_data.Length];
byte[] tmp = new byte[_data.Length];
for(var i = 0; i < _data.Length; i += 2)
for(int i = 0; i < _data.Length; i += 2)
{
tmp[i] = _data[i + 1];
tmp[i + 1] = _data[i];
@@ -674,8 +674,8 @@ public class Nintendo64 : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
var foundSaveRam = false;
bool foundRom = false;
bool foundSaveRam = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)
@@ -838,9 +838,9 @@ public class Nintendo64 : IByteAddressableImage
if(_interleaved)
{
var tmp = new byte[_data.Length];
byte[] tmp = new byte[_data.Length];
for(var i = 0; i < _data.Length; i += 2)
for(int i = 0; i < _data.Length; i += 2)
{
tmp[i] = _data[i + 1];
tmp[i + 1] = _data[i];

View File

@@ -41,8 +41,8 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.Images;
@@ -100,7 +100,7 @@ public class SegaMegaDrive : IByteAddressableImage
if(stream.Length % 512 != 0) return false;
var buffer = new byte[4];
byte[] buffer = new byte[4];
stream.Position = 256;
stream.EnsureRead(buffer, 0, 4);
@@ -141,7 +141,7 @@ public class SegaMegaDrive : IByteAddressableImage
if(stream.Length % 512 != 0) return ErrorNumber.InvalidArgument;
var buffer = new byte[4];
byte[] buffer = new byte[4];
stream.Position = 256;
stream.EnsureRead(buffer, 0, 4);
@@ -189,15 +189,15 @@ public class SegaMegaDrive : IByteAddressableImage
// Interleaves every 16KiB
if(_smd)
{
var tmp = new byte[_data.Length];
var bankIn = new byte[16384];
var bankOut = new byte[16384];
byte[] tmp = new byte[_data.Length];
byte[] bankIn = new byte[16384];
byte[] bankOut = new byte[16384];
for(var b = 0; b < _data.Length / 16384; b++)
for(int b = 0; b < _data.Length / 16384; b++)
{
Array.Copy(_data, b * 16384, bankIn, 0, 16384);
for(var i = 0; i < 8192; i++)
for(int i = 0; i < 8192; i++)
{
bankOut[i * 2 + 1] = bankIn[i];
bankOut[i * 2] = bankIn[i + 8192];
@@ -210,10 +210,10 @@ public class SegaMegaDrive : IByteAddressableImage
}
else if(_interleaved)
{
var tmp = new byte[_data.Length];
int half = _data.Length / 2;
byte[] tmp = new byte[_data.Length];
int half = _data.Length / 2;
for(var i = 0; i < half; i++)
for(int i = 0; i < half; i++)
{
tmp[i * 2] = _data[i];
tmp[i * 2 + 1] = _data[i + half];
@@ -402,10 +402,10 @@ public class SegaMegaDrive : IByteAddressableImage
if(_interleaved)
{
var tmp = new byte[_data.Length];
int half = _data.Length / 2;
byte[] tmp = new byte[_data.Length];
int half = _data.Length / 2;
for(var i = 0; i < half; i++)
for(int i = 0; i < half; i++)
{
tmp[i] = _data[i * 2];
tmp[i + half] = _data[i * 2 + 1];
@@ -430,15 +430,15 @@ public class SegaMegaDrive : IByteAddressableImage
_dataStream.Write(smdHeader, 0, smdHeader.Length);
var tmp = new byte[_data.Length];
var bankIn = new byte[16384];
var bankOut = new byte[16384];
byte[] tmp = new byte[_data.Length];
byte[] bankIn = new byte[16384];
byte[] bankOut = new byte[16384];
for(var b = 0; b < _data.Length / 16384; b++)
for(int b = 0; b < _data.Length / 16384; b++)
{
Array.Copy(_data, b * 16384, bankIn, 0, 16384);
for(var i = 0; i < 8192; i++)
for(int i = 0; i < 8192; i++)
{
bankOut[i] = bankIn[i * 2 + 1];
bankOut[i + 8192] = bankIn[i * 2];
@@ -730,8 +730,8 @@ public class SegaMegaDrive : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
var foundSaveRam = false;
bool foundRom = false;
bool foundSaveRam = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)

View File

@@ -9,8 +9,8 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.Images;
@@ -61,7 +61,7 @@ public class SuperNintendo : IByteAddressableImage
return false;
Header header;
var headerBytes = new byte[48];
byte[] headerBytes = new byte[48];
switch(stream.Length)
{
@@ -109,8 +109,8 @@ public class SuperNintendo : IByteAddressableImage
// Not sure but seems to be a multiple of at least this
if(stream.Length % 32768 != 0) return ErrorNumber.InvalidArgument;
var found = false;
var headerBytes = new byte[48];
bool found = false;
byte[] headerBytes = new byte[48];
switch(stream.Length)
{
@@ -373,7 +373,7 @@ public class SuperNintendo : IByteAddressableImage
bool hasFlash = _header is { OldMakerCode: 0x33, ExpansionFlashSize: > 0 };
bool hasBattery = chipset is 2 or 5 or 6 or 9 or 0xA;
var devices = 1;
int devices = 1;
if(hasRam) devices++;
@@ -396,8 +396,8 @@ public class SuperNintendo : IByteAddressableImage
}
};
var pos = 1;
var addr = (ulong)_data.Length;
int pos = 1;
ulong addr = (ulong)_data.Length;
if(hasRam)
{
@@ -537,10 +537,10 @@ public class SuperNintendo : IByteAddressableImage
return ErrorNumber.ReadOnly;
}
var foundRom = false;
var foundRam = false;
var foundExtraRam = false;
var foundFlash = false;
bool foundRom = false;
bool foundRam = false;
bool foundExtraRam = false;
bool foundFlash = false;
// Sanitize
foreach(LinearMemoryDevice map in mappings.Devices)