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

4
Aaru.Images/BlindWrite4/BlindWrite4.cs
View File

@@ -30,14 +30,14 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System.Collections.Generic;
using System.IO;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
namespace Aaru.DiscImages;
// TODO: Too many unknowns, plus a completely unknown footer, to make this writable
/// <inheritdoc />
/// <summary>Implements reading BlindWrite 4 disc images</summary>

3
Aaru.Images/BlindWrite4/Constants.cs
View File

@@ -37,7 +37,6 @@ public sealed partial class BlindWrite4
/// <summary>"BLINDWRITE TOC FILE"</summary>
readonly byte[] _bw4Signature =
{
0x42, 0x4C, 0x49, 0x4E, 0x44, 0x57, 0x52, 0x49, 0x54, 0x45, 0x20, 0x54, 0x4F, 0x43, 0x20, 0x46, 0x49, 0x4C,
0x45
0x42, 0x4C, 0x49, 0x4E, 0x44, 0x57, 0x52, 0x49, 0x54, 0x45, 0x20, 0x54, 0x4F, 0x43, 0x20, 0x46, 0x49, 0x4C, 0x45
};
}

4
Aaru.Images/BlindWrite4/Enums.cs
View File

@@ -36,6 +36,8 @@ public sealed partial class BlindWrite4
{
enum TrackType : byte
{
Audio = 0, Mode1 = 1, Mode2 = 2
Audio = 0,
Mode1 = 1,
Mode2 = 2
}
}

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

@@ -30,12 +30,12 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System.IO;
using System.Linq;
using Aaru.CommonTypes.Interfaces;
namespace Aaru.DiscImages;
public sealed partial class BlindWrite4
{
/// <inheritdoc />
@@ -47,7 +47,7 @@ public sealed partial class BlindWrite4
if(stream.Length < 19)
return false;
byte[] signature = new byte[19];
var signature = new byte[19];
stream.Read(signature, 0, 19);
return _bw4Signature.SequenceEqual(signature);

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

@@ -30,14 +30,14 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.Collections.Generic;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Structs;
using Schemas;
namespace Aaru.DiscImages;
public sealed partial class BlindWrite4
{
/// <inheritdoc />
@@ -46,7 +46,7 @@ public sealed partial class BlindWrite4
/// <inheritdoc />
public string Name => "BlindWrite 4";
/// <inheritdoc />
public Guid Id => new Guid("664568B2-15D4-4E64-8A7A-20BDA8B8386F");
public Guid Id => new("664568B2-15D4-4E64-8A7A-20BDA8B8386F");
/// <inheritdoc />
public string Author => "Natalia Portillo";
/// <inheritdoc />

138
Aaru.Images/BlindWrite4/Read.cs
View File

@@ -30,6 +30,8 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -45,8 +47,6 @@ using Aaru.Decoders.CD;
using Aaru.Helpers;
using Session = Aaru.CommonTypes.Structs.Session;
namespace Aaru.DiscImages;
public sealed partial class BlindWrite4
{
/// <inheritdoc />
@@ -58,10 +58,10 @@ public sealed partial class BlindWrite4
if(stream.Length < 19)
return ErrorNumber.InvalidArgument;
byte[] tmpArray = new byte[19];
byte[] tmpUShort = new byte[2];
byte[] tmpUInt = new byte[4];
byte[] tmpULong = new byte[8];
var tmpArray = new byte[19];
var tmpUShort = new byte[2];
var tmpUInt = new byte[4];
var tmpULong = new byte[8];
stream.Read(tmpArray, 0, 19);
@@ -153,7 +153,7 @@ public sealed partial class BlindWrite4
_bwTracks = new List<TrackDescriptor>();
for(int i = 0; i < _header.TrackDescriptors; i++)
for(var i = 0; i < _header.TrackDescriptors; i++)
{
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "stream.Position = {0}", stream.Position);
@@ -210,7 +210,7 @@ public sealed partial class BlindWrite4
track.unknown13 = new uint[2];
for(int j = 0; j < track.unknown13.Length; j++)
for(var j = 0; j < track.unknown13.Length; j++)
{
stream.Read(tmpUInt, 0, 4);
track.unknown13[j] = BitConverter.ToUInt32(tmpUInt, 0);
@@ -326,9 +326,9 @@ public sealed partial class BlindWrite4
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.offset = {0}", track.offset);
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.subchannel = {0}", track.subchannel);
for(int j = 0; j < track.unknown1.Length; j++)
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown1[{1}] = 0x{0:X8}",
track.unknown1[j], j);
for(var j = 0; j < track.unknown1.Length; j++)
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown1[{1}] = 0x{0:X8}", track.unknown1[j],
j);
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown2 = {0}", track.unknown2);
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown3 = {0}", track.unknown3);
@@ -349,9 +349,9 @@ public sealed partial class BlindWrite4
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.pregap = {0}", track.pregap);
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.startSector = {0}", track.startSector);
for(int j = 0; j < track.unknown13.Length; j++)
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown13[{1}] = 0x{0:X8}",
track.unknown13[j], j);
for(var j = 0; j < track.unknown13.Length; j++)
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown13[{1}] = 0x{0:X8}", track.unknown13[j],
j);
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.titleLen = {0}", track.titleLen);
AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.title = {0}", track.title);
@@ -398,45 +398,37 @@ public sealed partial class BlindWrite4
break;
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
_header.DataFile.ToLower(CultureInfo.
CurrentCulture)));
_header.DataFile.ToLower(CultureInfo.CurrentCulture)));
if(_dataFilter != null)
break;
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
_header.DataFile.ToUpper(CultureInfo.
CurrentCulture)));
_header.DataFile.ToUpper(CultureInfo.CurrentCulture)));
if(_dataFilter != null)
break;
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).
Last()));
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).Last()));
if(_dataFilter != null)
break;
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).
Last().ToLower(CultureInfo.CurrentCulture)));
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture)));
if(_dataFilter != null)
break;
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).
Last().ToUpper(CultureInfo.CurrentCulture)));
_dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture)));
if(_dataFilter != null)
break;
@@ -459,11 +451,9 @@ public sealed partial class BlindWrite4
_subFilter =
((((filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile)) ??
filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
_header.SubchannelFile.
ToLower(CultureInfo.CurrentCulture)))) ??
_header.SubchannelFile.ToLower(CultureInfo.CurrentCulture)))) ??
filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
_header.SubchannelFile.
ToUpper(CultureInfo.CurrentCulture)))) ??
_header.SubchannelFile.ToUpper(CultureInfo.CurrentCulture)))) ??
filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[]
{
'\\'
@@ -498,8 +488,7 @@ public sealed partial class BlindWrite4
if(!string.IsNullOrEmpty(bwTrack.filename))
do
{
track.Filter =
filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename));
track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename));
if(track.Filter != null)
break;
@@ -518,38 +507,32 @@ public sealed partial class BlindWrite4
if(track.Filter != null)
break;
track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
bwTrack.filename.Split(new[]
{
'\\'
},
StringSplitOptions.
RemoveEmptyEntries).
track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename.
Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).
Last()));
if(track.Filter != null)
break;
track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
bwTrack.filename.Split(new[]
{
'\\'
},
StringSplitOptions.
RemoveEmptyEntries).
track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename.
Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).
Last().ToLower(CultureInfo.
CurrentCulture)));
if(track.Filter != null)
break;
track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
bwTrack.filename.Split(new[]
{
'\\'
},
StringSplitOptions.
RemoveEmptyEntries).
track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename.
Split(new[]
{
'\\'
}, StringSplitOptions.RemoveEmptyEntries).
Last().ToUpper(CultureInfo.
CurrentCulture)));
@@ -560,9 +543,9 @@ public sealed partial class BlindWrite4
track.File = _dataFilter.Filename;
track.FileOffset = bwTrack.offset + ((150 - bwTrack.pregapOffsetAdjustment) * 2352);
track.FileOffset = bwTrack.offset + (150 - bwTrack.pregapOffsetAdjustment) * 2352;
track.SubchannelOffset = ((bwTrack.offset / 2352) + (150 - bwTrack.pregapOffsetAdjustment)) * 96;
track.SubchannelOffset = (bwTrack.offset / 2352 + (150 - bwTrack.pregapOffsetAdjustment)) * 96;
if(bwTrack.pregap > 0)
{
@@ -755,11 +738,11 @@ public sealed partial class BlindWrite4
_imageInfo.LastModificationTime = _dataFilter.LastWriteTime;
_imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
bool data = false;
bool mode2 = false;
bool firstAudio = false;
bool firstData = false;
bool audio = false;
var data = false;
var mode2 = false;
var firstAudio = false;
var firstData = false;
var audio = false;
foreach(Track bwTrack in Tracks)
{
@@ -792,7 +775,7 @@ public sealed partial class BlindWrite4
Sessions.Count > 1 &&
mode2)
_imageInfo.MediaType = MediaType.CDPLUS;
else if((firstData && audio) || mode2)
else if(firstData && audio || mode2)
_imageInfo.MediaType = MediaType.CDROMXA;
else if(!audio)
_imageInfo.MediaType = MediaType.CDROM;
@@ -830,8 +813,7 @@ public sealed partial class BlindWrite4
}
/// <inheritdoc />
public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
ReadSectors(sectorAddress, 1, out buffer);
public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) => ReadSectors(sectorAddress, 1, out buffer);
/// <inheritdoc />
public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
@@ -892,7 +874,7 @@ public sealed partial class BlindWrite4
uint sectorOffset;
uint sectorSize;
uint sectorSkip;
bool mode2 = false;
var mode2 = false;
switch(aaruTrack.Type)
{
@@ -947,9 +929,9 @@ public sealed partial class BlindWrite4
buffer = br.ReadBytes((int)(sectorSize * length));
for(int i = 0; i < length; i++)
for(var i = 0; i < length; i++)
{
byte[] sector = new byte[sectorSize];
var sector = new byte[sectorSize];
Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize);
sector = Sector.GetUserDataFromMode2(sector);
mode2Ms.Write(sector, 0, sector.Length);
@@ -961,7 +943,7 @@ public sealed partial class BlindWrite4
sectorSkip == 0)
buffer = br.ReadBytes((int)(sectorSize * length));
else
for(int i = 0; i < length; i++)
for(var i = 0; i < length; i++)
{
br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
byte[] sector = br.ReadBytes((int)sectorSize);
@@ -1155,7 +1137,7 @@ public sealed partial class BlindWrite4
sectorSkip == 0)
buffer = br.ReadBytes((int)(sectorSize * length));
else
for(int i = 0; i < length; i++)
for(var i = 0; i < length; i++)
{
br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
byte[] sector = br.ReadBytes((int)sectorSize);

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

@@ -30,11 +30,11 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System.Runtime.InteropServices;
using Aaru.CommonTypes.Interfaces;
namespace Aaru.DiscImages;
public sealed partial class BlindWrite4
{
struct Header

16
Aaru.Images/BlindWrite4/Verify.cs
View File

@@ -30,13 +30,13 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.Collections.Generic;
using Aaru.Checksums;
using Aaru.CommonTypes.Enums;
namespace Aaru.DiscImages;
public sealed partial class BlindWrite4
{
/// <inheritdoc />
@@ -58,10 +58,10 @@ public sealed partial class BlindWrite4
if(errno != ErrorNumber.NoError)
return null;
int bps = (int)(buffer.Length / length);
byte[] sector = new byte[bps];
var bps = (int)(buffer.Length / length);
var sector = new byte[bps];
for(int i = 0; i < length; i++)
for(var i = 0; i < length; i++)
{
Array.Copy(buffer, i * bps, sector, 0, bps);
bool? sectorStatus = CdChecksums.CheckCdSector(sector);
@@ -96,10 +96,10 @@ public sealed partial class BlindWrite4
if(errno != ErrorNumber.NoError)
return null;
int bps = (int)(buffer.Length / length);
byte[] sector = new byte[bps];
var bps = (int)(buffer.Length / length);
var sector = new byte[bps];
for(int i = 0; i < length; i++)
for(var i = 0; i < length; i++)
{
Array.Copy(buffer, i * bps, sector, 0, bps);
bool? sectorStatus = CdChecksums.CheckCdSector(sector);