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

Rename Aaru.Console project to Aaru.Logging.

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-17 05:50:25 +01:00
parent 1a6f7a02c6
commit 02ec8a05d8
365 changed files with 5465 additions and 5347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,8 @@
using System;
using System.IO;
using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Claunia.Encoding;
namespace Aaru.Images;
@@ -48,8 +48,8 @@ public sealed partial class DiskCopy42
{
Stream stream = imageFilter.GetDataForkStream();
stream.Seek(0, SeekOrigin.Begin);
var buffer = new byte[0x58];
var pString = new byte[64];
byte[] buffer = new byte[0x58];
byte[] pString = new byte[64];
stream.EnsureRead(buffer, 0, 0x58);
// Incorrect pascal string length, not DC42

24
Aaru.Images/DiskCopy42/Read.cs
View File

@@ -36,8 +36,8 @@ using System.Text.RegularExpressions;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Claunia.Encoding;
using Claunia.RsrcFork;
using Version = Resources.Version;
@@ -53,8 +53,8 @@ public sealed partial class DiskCopy42
{
Stream stream = imageFilter.GetDataForkStream();
stream.Seek(0, SeekOrigin.Begin);
var buffer = new byte[0x58];
var pString = new byte[64];
byte[] buffer = new byte[0x58];
byte[] pString = new byte[64];
stream.EnsureRead(buffer, 0, 0x58);
IsWriting = false;
@@ -186,8 +186,8 @@ public sealed partial class DiskCopy42
if(imageInfo.MediaType == MediaType.AppleFileWare)
{
var data = new byte[header.DataSize];
var tags = new byte[header.TagSize];
byte[] data = new byte[header.DataSize];
byte[] tags = new byte[header.TagSize];
twiggyCache = new byte[header.DataSize];
twiggyCacheTags = new byte[header.TagSize];
@@ -201,8 +201,8 @@ public sealed partial class DiskCopy42
tagStream.Seek(tagOffset, SeekOrigin.Begin);
tagStream.EnsureRead(tags, 0, (int)header.TagSize);
var mfsMagic = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x400);
var mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x412);
ushort mfsMagic = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x400);
ushort mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x412);
// Detect a Macintosh Twiggy
if(mfsMagic == 0xD2D7 && mfsAllBlocks == 422)
@@ -221,10 +221,10 @@ public sealed partial class DiskCopy42
Array.Copy(data, 0, twiggyCache, 0, header.DataSize / 2);
Array.Copy(tags, 0, twiggyCacheTags, 0, header.TagSize / 2);
var copiedSectors = 0;
var sectorsToCopy = 0;
int copiedSectors = 0;
int sectorsToCopy = 0;
for(var i = 0; i < 46; i++)
for(int i = 0; i < 46; i++)
{
sectorsToCopy = i switch
{
@@ -274,8 +274,8 @@ public sealed partial class DiskCopy42
string release = null;
string pre = null;
var major = $"{version.MajorVersion}";
var minor = $".{version.MinorVersion / 10}";
string major = $"{version.MajorVersion}";
string minor = $".{version.MinorVersion / 10}";
if(version.MinorVersion % 10 > 0) release = $".{version.MinorVersion % 10}";

8
Aaru.Images/DiskCopy42/Verify.cs
View File

@@ -31,8 +31,8 @@
// ****************************************************************************/
using System.IO;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
namespace Aaru.Images;
@@ -43,9 +43,9 @@ public sealed partial class DiskCopy42
/// <inheritdoc />
public bool? VerifyMediaImage()
{
var data = new byte[header.DataSize];
var tags = new byte[header.TagSize];
uint tagsChk = 0;
byte[] data = new byte[header.DataSize];
byte[] tags = new byte[header.TagSize];
uint tagsChk = 0;
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_data);
Stream dataStream = dc42ImageFilter.GetDataForkStream();

8
Aaru.Images/DiskCopy42/Write.cs
View File

@@ -36,8 +36,8 @@ using Aaru.CommonTypes;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Aaru.Console;
using Aaru.Helpers;
using Aaru.Logging;
using Claunia.Encoding;
namespace Aaru.Images;
@@ -51,8 +51,8 @@ public sealed partial class DiskCopy42
uint sectorSize)
{
header = new Header();
var tags = false;
var macosx = false;
bool tags = false;
bool macosx = false;
if(options != null && options.TryGetValue("macosx", out string tmpOption)) bool.TryParse(tmpOption, out macosx);
@@ -387,7 +387,7 @@ public sealed partial class DiskCopy42
if(writingStream.Length == 0x54 + header.DataSize) header.TagSize = 0;
writingStream.Seek(0x54, SeekOrigin.Begin);
var data = new byte[header.DataSize];
byte[] data = new byte[header.DataSize];
writingStream.EnsureRead(data, 0, (int)header.DataSize);
header.DataChecksum = CheckSum(data);
writingStream.Seek(0x54 + header.DataSize, SeekOrigin.Begin);