t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ReadAsync/WriteAsync overloads

Browse Source
This commit is contained in:
Loporrit
2025-06-30 15:28:07 +00:00
parent 660319d74b
commit c8e988abc5
3 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MareSynchronos/Utils/HashingStream.cs
View File

@@ -41,8 +41,7 @@ public class HashingStream : Stream
public override int Read(byte[] buffer, int offset, int count)
{
if (_finished)
throw new ObjectDisposedException("HashingStream");
ObjectDisposedException.ThrowIf(_finished, this);
int n = _stream.Read(buffer, offset, count);
if (n > 0)
_hashAlgo.TransformBlock(buffer, offset, n, buffer, offset);
@@ -56,15 +55,13 @@ public class HashingStream : Stream
public override void SetLength(long value)
{
if (_finished)
throw new ObjectDisposedException("HashingStream");
ObjectDisposedException.ThrowIf(_finished, this);
_stream.SetLength(value);
}
public override void Write(byte[] buffer, int offset, int count)
{
if (_finished)
throw new ObjectDisposedException("HashingStream");
ObjectDisposedException.ThrowIf(_finished, this);
_stream.Write(buffer, offset, count);
string x = new(System.Text.Encoding.ASCII.GetChars(buffer.AsSpan().Slice(offset, count).ToArray()));
_hashAlgo.TransformBlock(buffer, offset, count, buffer, offset);
@@ -73,10 +70,10 @@ public class HashingStream : Stream
public byte[] Finish()
{
if (_finished)
return _hashAlgo.Hash;
return _hashAlgo.Hash!;
_hashAlgo.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
if (DisposeUnderlying)
_stream.Dispose();
return _hashAlgo.Hash;
return _hashAlgo.Hash!;
}
}

27
MareSynchronos/Utils/LimitedStream.cs
View File

@@ -59,7 +59,21 @@ public class LimitedStream : Stream
if (count > remainder)
count = remainder;
#pragma warning disable CA1835
int n = await _stream.ReadAsync(buffer, offset, count, cancellationToken);
#pragma warning restore CA1835
_estimatedPosition += n;
return n;
}
public async override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken)
{
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
if (buffer.Length > remainder)
buffer = buffer[..remainder];
int n = await _stream.ReadAsync(buffer, cancellationToken);
_estimatedPosition += n;
return n;
}
@@ -94,7 +108,20 @@ public class LimitedStream : Stream
if (count > remainder)
count = remainder;
#pragma warning disable CA1835
await _stream.WriteAsync(buffer, offset, count, cancellationToken);
#pragma warning restore CA1835
_estimatedPosition += count;
}
public async override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken)
{
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
if (buffer.Length > remainder)
buffer = buffer[..remainder];
await _stream.WriteAsync(buffer, cancellationToken);
_estimatedPosition += buffer.Length;
}
}