mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
General code refactor and reformat.
This commit is contained in:
@@ -42,14 +42,14 @@ namespace DiscImageChef.Core
|
||||
[Flags]
|
||||
public enum EnableChecksum
|
||||
{
|
||||
Adler32 = 1,
|
||||
Crc16 = 2,
|
||||
Crc32 = 4,
|
||||
Crc64 = 8,
|
||||
Md5 = 16,
|
||||
#if !NETSTANDARD2_0
|
||||
Ripemd160 = 32,
|
||||
#endif
|
||||
Adler32 = 1,
|
||||
Crc16 = 2,
|
||||
Crc32 = 4,
|
||||
Crc64 = 8,
|
||||
Md5 = 16,
|
||||
#if !NETSTANDARD2_0
|
||||
Ripemd160 = 32,
|
||||
#endif
|
||||
Sha1 = 64,
|
||||
Sha256 = 128,
|
||||
Sha384 = 256,
|
||||
@@ -57,12 +57,11 @@ namespace DiscImageChef.Core
|
||||
SpamSum = 1024,
|
||||
Fletcher16 = 2048,
|
||||
Fletcher32 = 4096,
|
||||
All = Adler32 | Crc16 | Crc32 | Crc64 | Md5 |
|
||||
#if !NETSTANDARD2_0
|
||||
All = Adler32 | Crc16 | Crc32 | Crc64 | Md5 |
|
||||
#if !NETSTANDARD2_0
|
||||
Ripemd160 |
|
||||
#endif
|
||||
Sha1 | Sha256 | Sha384 | Sha512 | SpamSum |
|
||||
Fletcher16 | Fletcher32
|
||||
#endif
|
||||
Sha1 | Sha256 | Sha384 | Sha512 | SpamSum | Fletcher16 | Fletcher32
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -92,11 +91,6 @@ namespace DiscImageChef.Core
|
||||
IChecksum md5Ctx;
|
||||
HashPacket md5Pkt;
|
||||
Thread md5Thread;
|
||||
#if !NETSTANDARD2_0
|
||||
IChecksum ripemd160Ctx;
|
||||
HashPacket ripemd160Pkt;
|
||||
Thread ripemd160Thread;
|
||||
#endif
|
||||
IChecksum sha1Ctx;
|
||||
HashPacket sha1Pkt;
|
||||
Thread sha1Thread;
|
||||
@@ -147,13 +141,13 @@ namespace DiscImageChef.Core
|
||||
md5Pkt = new HashPacket {Context = md5Ctx};
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
#if !NETSTANDARD2_0
|
||||
if(enabled.HasFlag(EnableChecksum.Ripemd160))
|
||||
{
|
||||
ripemd160Ctx = new Ripemd160Context();
|
||||
ripemd160Pkt = new HashPacket {Context = ripemd160Ctx};
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if(enabled.HasFlag(EnableChecksum.Sha1))
|
||||
{
|
||||
@@ -197,21 +191,21 @@ namespace DiscImageChef.Core
|
||||
f32Pkt = new HashPacket {Context = f32Ctx};
|
||||
}
|
||||
|
||||
adlerThread = new Thread(UpdateHash);
|
||||
crc16Thread = new Thread(UpdateHash);
|
||||
crc32Thread = new Thread(UpdateHash);
|
||||
crc64Thread = new Thread(UpdateHash);
|
||||
md5Thread = new Thread(UpdateHash);
|
||||
#if !NETSTANDARD2_0
|
||||
adlerThread = new Thread(UpdateHash);
|
||||
crc16Thread = new Thread(UpdateHash);
|
||||
crc32Thread = new Thread(UpdateHash);
|
||||
crc64Thread = new Thread(UpdateHash);
|
||||
md5Thread = new Thread(UpdateHash);
|
||||
#if !NETSTANDARD2_0
|
||||
ripemd160Thread = new Thread(UpdateHash);
|
||||
#endif
|
||||
sha1Thread = new Thread(UpdateHash);
|
||||
sha256Thread = new Thread(UpdateHash);
|
||||
sha384Thread = new Thread(UpdateHash);
|
||||
sha512Thread = new Thread(UpdateHash);
|
||||
spamsumThread = new Thread(UpdateHash);
|
||||
f16Thread = new Thread(UpdateHash);
|
||||
f32Thread = new Thread(UpdateHash);
|
||||
#endif
|
||||
sha1Thread = new Thread(UpdateHash);
|
||||
sha256Thread = new Thread(UpdateHash);
|
||||
sha384Thread = new Thread(UpdateHash);
|
||||
sha512Thread = new Thread(UpdateHash);
|
||||
spamsumThread = new Thread(UpdateHash);
|
||||
f16Thread = new Thread(UpdateHash);
|
||||
f32Thread = new Thread(UpdateHash);
|
||||
}
|
||||
|
||||
public void Update(byte[] data)
|
||||
@@ -246,13 +240,13 @@ namespace DiscImageChef.Core
|
||||
md5Thread.Start(md5Pkt);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
#if !NETSTANDARD2_0
|
||||
if(enabled.HasFlag(EnableChecksum.Ripemd160))
|
||||
{
|
||||
ripemd160Pkt.Data = data;
|
||||
ripemd160Thread.Start(ripemd160Pkt);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if(enabled.HasFlag(EnableChecksum.Sha1))
|
||||
{
|
||||
@@ -296,30 +290,29 @@ namespace DiscImageChef.Core
|
||||
f32Thread.Start(f32Pkt);
|
||||
}
|
||||
|
||||
while(adlerThread.IsAlive || crc16Thread.IsAlive || crc32Thread.IsAlive || crc64Thread.IsAlive ||
|
||||
md5Thread.IsAlive ||
|
||||
#if !NETSTANDARD2_0
|
||||
while(adlerThread.IsAlive || crc16Thread.IsAlive || crc32Thread.IsAlive || crc64Thread.IsAlive ||
|
||||
md5Thread.IsAlive ||
|
||||
#if !NETSTANDARD2_0
|
||||
ripemd160Thread.IsAlive ||
|
||||
#endif
|
||||
sha1Thread.IsAlive || sha256Thread.IsAlive ||
|
||||
sha384Thread.IsAlive || sha512Thread.IsAlive || spamsumThread.IsAlive || f16Thread.IsAlive ||
|
||||
f32Thread.IsAlive) { }
|
||||
#endif
|
||||
sha1Thread.IsAlive || sha256Thread.IsAlive || sha384Thread.IsAlive || sha512Thread.IsAlive ||
|
||||
spamsumThread.IsAlive || f16Thread.IsAlive || f32Thread.IsAlive) { }
|
||||
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) adlerThread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) crc16Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) crc32Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) crc64Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) md5Thread = new Thread(UpdateHash);
|
||||
#if !NETSTANDARD2_0
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) adlerThread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) crc16Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) crc32Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) crc64Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) md5Thread = new Thread(UpdateHash);
|
||||
#if !NETSTANDARD2_0
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) ripemd160Thread = new Thread(UpdateHash);
|
||||
#endif
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha1Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha256Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha384Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha512Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) spamsumThread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) f16Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) f32Thread = new Thread(UpdateHash);
|
||||
#endif
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha1Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha256Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha384Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) sha512Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) spamsumThread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) f16Thread = new Thread(UpdateHash);
|
||||
if(enabled.HasFlag(EnableChecksum.SpamSum)) f32Thread = new Thread(UpdateHash);
|
||||
}
|
||||
|
||||
public List<ChecksumType> End()
|
||||
@@ -358,13 +351,13 @@ namespace DiscImageChef.Core
|
||||
chks.Add(chk);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
#if !NETSTANDARD2_0
|
||||
if(enabled.HasFlag(EnableChecksum.Ripemd160))
|
||||
{
|
||||
chk = new ChecksumType {type = ChecksumTypeType.ripemd160, Value = ripemd160Ctx.End()};
|
||||
chks.Add(chk);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if(enabled.HasFlag(EnableChecksum.Sha1))
|
||||
{
|
||||
@@ -412,37 +405,37 @@ namespace DiscImageChef.Core
|
||||
|
||||
internal static List<ChecksumType> GetChecksums(byte[] data, EnableChecksum enabled = EnableChecksum.All)
|
||||
{
|
||||
IChecksum adler32CtxData = null;
|
||||
IChecksum crc16CtxData = null;
|
||||
IChecksum crc32CtxData = null;
|
||||
IChecksum crc64CtxData = null;
|
||||
IChecksum md5CtxData = null;
|
||||
#if !NETSTANDARD2_0
|
||||
IChecksum adler32CtxData = null;
|
||||
IChecksum crc16CtxData = null;
|
||||
IChecksum crc32CtxData = null;
|
||||
IChecksum crc64CtxData = null;
|
||||
IChecksum md5CtxData = null;
|
||||
#if !NETSTANDARD2_0
|
||||
IChecksum ripemd160CtxData = null;
|
||||
#endif
|
||||
IChecksum sha1CtxData = null;
|
||||
IChecksum sha256CtxData = null;
|
||||
IChecksum sha384CtxData = null;
|
||||
IChecksum sha512CtxData = null;
|
||||
IChecksum ssctxData = null;
|
||||
IChecksum f16CtxData = null;
|
||||
IChecksum f32CtxData = null;
|
||||
#endif
|
||||
IChecksum sha1CtxData = null;
|
||||
IChecksum sha256CtxData = null;
|
||||
IChecksum sha384CtxData = null;
|
||||
IChecksum sha512CtxData = null;
|
||||
IChecksum ssctxData = null;
|
||||
IChecksum f16CtxData = null;
|
||||
IChecksum f32CtxData = null;
|
||||
|
||||
Thread adlerThreadData = new Thread(UpdateHash);
|
||||
Thread crc16ThreadData = new Thread(UpdateHash);
|
||||
Thread crc32ThreadData = new Thread(UpdateHash);
|
||||
Thread crc64ThreadData = new Thread(UpdateHash);
|
||||
Thread md5ThreadData = new Thread(UpdateHash);
|
||||
#if !NETSTANDARD2_0
|
||||
Thread adlerThreadData = new Thread(UpdateHash);
|
||||
Thread crc16ThreadData = new Thread(UpdateHash);
|
||||
Thread crc32ThreadData = new Thread(UpdateHash);
|
||||
Thread crc64ThreadData = new Thread(UpdateHash);
|
||||
Thread md5ThreadData = new Thread(UpdateHash);
|
||||
#if !NETSTANDARD2_0
|
||||
Thread ripemd160ThreadData = new Thread(UpdateHash);
|
||||
#endif
|
||||
Thread sha1ThreadData = new Thread(UpdateHash);
|
||||
Thread sha256ThreadData = new Thread(UpdateHash);
|
||||
Thread sha384ThreadData = new Thread(UpdateHash);
|
||||
Thread sha512ThreadData = new Thread(UpdateHash);
|
||||
Thread spamsumThreadData = new Thread(UpdateHash);
|
||||
Thread f16ThreadData = new Thread(UpdateHash);
|
||||
Thread f32ThreadData = new Thread(UpdateHash);
|
||||
#endif
|
||||
Thread sha1ThreadData = new Thread(UpdateHash);
|
||||
Thread sha256ThreadData = new Thread(UpdateHash);
|
||||
Thread sha384ThreadData = new Thread(UpdateHash);
|
||||
Thread sha512ThreadData = new Thread(UpdateHash);
|
||||
Thread spamsumThreadData = new Thread(UpdateHash);
|
||||
Thread f16ThreadData = new Thread(UpdateHash);
|
||||
Thread f32ThreadData = new Thread(UpdateHash);
|
||||
|
||||
if(enabled.HasFlag(EnableChecksum.Adler32))
|
||||
{
|
||||
@@ -479,14 +472,14 @@ namespace DiscImageChef.Core
|
||||
md5ThreadData.Start(md5PktData);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
#if !NETSTANDARD2_0
|
||||
if(enabled.HasFlag(EnableChecksum.Ripemd160))
|
||||
{
|
||||
ripemd160CtxData = new Ripemd160Context();
|
||||
HashPacket ripemd160PktData = new HashPacket {Context = ripemd160CtxData, Data = data};
|
||||
ripemd160ThreadData.Start(ripemd160PktData);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if(enabled.HasFlag(EnableChecksum.Sha1))
|
||||
{
|
||||
@@ -537,13 +530,13 @@ namespace DiscImageChef.Core
|
||||
f32ThreadData.Start(f32PktData);
|
||||
}
|
||||
|
||||
while(adlerThreadData.IsAlive || crc16ThreadData.IsAlive || crc32ThreadData.IsAlive ||
|
||||
crc64ThreadData.IsAlive || md5ThreadData.IsAlive ||
|
||||
#if !NETSTANDARD2_0
|
||||
while(adlerThreadData.IsAlive || crc16ThreadData.IsAlive || crc32ThreadData.IsAlive ||
|
||||
crc64ThreadData.IsAlive || md5ThreadData.IsAlive ||
|
||||
#if !NETSTANDARD2_0
|
||||
ripemd160ThreadData.IsAlive ||
|
||||
#endif
|
||||
sha1ThreadData.IsAlive || sha256ThreadData.IsAlive || sha384ThreadData.IsAlive ||
|
||||
sha512ThreadData.IsAlive || spamsumThreadData.IsAlive || f16ThreadData.IsAlive ||
|
||||
#endif
|
||||
sha1ThreadData.IsAlive || sha256ThreadData.IsAlive || sha384ThreadData.IsAlive ||
|
||||
sha512ThreadData.IsAlive || spamsumThreadData.IsAlive || f16ThreadData.IsAlive ||
|
||||
f32ThreadData.IsAlive) { }
|
||||
|
||||
List<ChecksumType> dataChecksums = new List<ChecksumType>();
|
||||
@@ -579,13 +572,13 @@ namespace DiscImageChef.Core
|
||||
dataChecksums.Add(chk);
|
||||
}
|
||||
|
||||
#if !NETSTANDARD2_0
|
||||
#if !NETSTANDARD2_0
|
||||
if(enabled.HasFlag(EnableChecksum.Ripemd160))
|
||||
{
|
||||
chk = new ChecksumType {type = ChecksumTypeType.ripemd160, Value = ripemd160CtxData.End()};
|
||||
dataChecksums.Add(chk);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if(enabled.HasFlag(EnableChecksum.Sha1))
|
||||
{
|
||||
@@ -631,6 +624,11 @@ namespace DiscImageChef.Core
|
||||
|
||||
return dataChecksums;
|
||||
}
|
||||
#if !NETSTANDARD2_0
|
||||
IChecksum ripemd160Ctx;
|
||||
HashPacket ripemd160Pkt;
|
||||
Thread ripemd160Thread;
|
||||
#endif
|
||||
|
||||
#region Threading helpers
|
||||
struct HashPacket
|
||||
|
||||
Reference in New Issue
Block a user