Improvements

src/DotUtils.StreamUtils/GreedyBufferedStream.cs → src/DotUtils.StreamUtils/ChunkedBufferStream.cs

@@ -9,13 +9,13 @@
 /// This is not supposed to bring performance benefits, but it allows to avoid nondeterministic
 /// GZipStream output for the identical input.
 /// </summary>
-public class GreedyBufferedStream : Stream
+public class ChunkedBufferStream : Stream
 {
     private readonly Stream _stream;
     private readonly byte[] _buffer;
     private int _position;
 
-    public GreedyBufferedStream(Stream stream, int bufferSize)
+    public ChunkedBufferStream(Stream stream, int bufferSize)
     {
         _stream = stream;
         _buffer = new byte[bufferSize];

src/DotUtils.StreamUtils/CleanupScope.cs

@@ -1,6 +1,6 @@
 namespace DotUtils.StreamUtils;
 
-internal class CleanupScope : IDisposable
+internal readonly struct CleanupScope : IDisposable
 {
     private readonly Action _disposeAction;
 

src/DotUtils.StreamUtils/StreamExtensions.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System.Buffers;
+using System.Diagnostics;
 
 namespace DotUtils.StreamUtils;
 
@@ -29,6 +30,35 @@ public static int ReadAtLeast(this Stream stream, byte[] buffer, int offset, int
         return totalRead;
     }
 
+    public static int SkipBytes(this Stream stream, int bytesCount, bool throwOnEndOfStream)
+    {
+        byte[] buffer = ArrayPool<byte>.Shared.Rent(4096);
+        using var _ = new CleanupScope(() => ArrayPool<byte>.Shared.Return(buffer));
+        return SkipBytes(stream, bytesCount, throwOnEndOfStream, buffer);
+    }
+
+    public static int SkipBytes(this Stream stream, int bytesCount, bool throwOnEndOfStream, byte[] buffer)
+    {
+        int totalRead = 0;
+        while (totalRead < bytesCount)
+        {
+            int read = stream.Read(buffer, 0, Math.Min(bytesCount - totalRead, buffer.Length));
+            if (read == 0)
+            {
+                if (throwOnEndOfStream)
+                {
+                    throw new InvalidDataException("Unexpected end of stream.");
+                }
+
+                return totalRead;
+            }
+
+            totalRead += read;
+        }
+
+        return totalRead;
+    }
+
     public static Stream ToReadableSeekableStream(this Stream stream)
     {
         return TransparentReadStream.CreateSeekableStream(stream);