From 227e70926b4c2f8fac45efc2fb1bb9a44d88ec70 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Sat, 31 Jan 2026 15:53:52 +0000 Subject: [PATCH] fmt --- src/SharpCompress/Common/EntryStream.cs | 1 - src/SharpCompress/Common/Rar/RarVolume.cs | 4 +++- src/SharpCompress/Compressors/ArcLzw/ArcLzwStream.cs | 2 -- .../Compressors/LZMA/Utilites/CrcBuilderStream.cs | 1 - src/SharpCompress/Compressors/PPMd/PpmdStream.cs | 1 - src/SharpCompress/Compressors/Shrink/ShrinkStream.cs | 1 - src/SharpCompress/IO/CountingStream.cs | 3 +-- src/SharpCompress/IO/IStreamStack.cs | 2 -- src/SharpCompress/IO/NonDisposingStream.cs | 2 ++ src/SharpCompress/IO/ReadOnlySubStream.cs | 2 +- tests/SharpCompress.Test/WriterTests.cs | 5 ++++- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/SharpCompress/Common/EntryStream.cs b/src/SharpCompress/Common/EntryStream.cs index 4bacdd83..8d6f3f4d 100644 --- a/src/SharpCompress/Common/EntryStream.cs +++ b/src/SharpCompress/Common/EntryStream.cs @@ -10,7 +10,6 @@ namespace SharpCompress.Common; public partial class EntryStream : Stream, IStreamStack { - Stream IStreamStack.BaseStream() => _stream; private readonly IReader _reader; diff --git a/src/SharpCompress/Common/Rar/RarVolume.cs b/src/SharpCompress/Common/Rar/RarVolume.cs index 3bf63309..4e4fa770 100644 --- a/src/SharpCompress/Common/Rar/RarVolume.cs +++ b/src/SharpCompress/Common/Rar/RarVolume.cs @@ -116,7 +116,9 @@ public abstract class RarVolume : Volume if (fh.FileName == "CMT") { var buffer = new byte[fh.CompressedSize]; - await fh.PackedStream.NotNull().ReadFullyAsync(buffer, cancellationToken); + await fh + .PackedStream.NotNull() + .ReadFullyAsync(buffer, cancellationToken); Comment = Encoding.UTF8.GetString(buffer, 0, buffer.Length - 1); } } diff --git a/src/SharpCompress/Compressors/ArcLzw/ArcLzwStream.cs b/src/SharpCompress/Compressors/ArcLzw/ArcLzwStream.cs index 979bba32..89c8ded3 100644 --- a/src/SharpCompress/Compressors/ArcLzw/ArcLzwStream.cs +++ b/src/SharpCompress/Compressors/ArcLzw/ArcLzwStream.cs @@ -8,10 +8,8 @@ using SharpCompress.IO; public partial class ArcLzwStream : Stream, IStreamStack { - Stream IStreamStack.BaseStream() => _stream; - private Stream _stream; private bool _processed; private bool _useCrunched; diff --git a/src/SharpCompress/Compressors/LZMA/Utilites/CrcBuilderStream.cs b/src/SharpCompress/Compressors/LZMA/Utilites/CrcBuilderStream.cs index 8ef2f6b9..7281e9d7 100644 --- a/src/SharpCompress/Compressors/LZMA/Utilites/CrcBuilderStream.cs +++ b/src/SharpCompress/Compressors/LZMA/Utilites/CrcBuilderStream.cs @@ -8,7 +8,6 @@ namespace SharpCompress.Compressors.LZMA.Utilites; internal partial class CrcBuilderStream : Stream, IStreamStack { - Stream IStreamStack.BaseStream() => _mTarget; private readonly Stream _mTarget; diff --git a/src/SharpCompress/Compressors/PPMd/PpmdStream.cs b/src/SharpCompress/Compressors/PPMd/PpmdStream.cs index 957f55f2..893c718b 100644 --- a/src/SharpCompress/Compressors/PPMd/PpmdStream.cs +++ b/src/SharpCompress/Compressors/PPMd/PpmdStream.cs @@ -13,7 +13,6 @@ namespace SharpCompress.Compressors.PPMd; public class PpmdStream : Stream, IStreamStack { - Stream IStreamStack.BaseStream() => _stream; private readonly PpmdProperties _properties; diff --git a/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs b/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs index a0115c2e..3680b0d8 100644 --- a/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs +++ b/src/SharpCompress/Compressors/Shrink/ShrinkStream.cs @@ -7,7 +7,6 @@ namespace SharpCompress.Compressors.Shrink; internal partial class ShrinkStream : Stream, IStreamStack { - Stream IStreamStack.BaseStream() => inStream; private Stream inStream; diff --git a/src/SharpCompress/IO/CountingStream.cs b/src/SharpCompress/IO/CountingStream.cs index 8c5f3086..ff6df3d5 100644 --- a/src/SharpCompress/IO/CountingStream.cs +++ b/src/SharpCompress/IO/CountingStream.cs @@ -41,8 +41,7 @@ internal class CountingStream : Stream public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count); - public override long Seek(long offset, SeekOrigin origin) => - _stream.Seek(offset, origin); + public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin); public override void SetLength(long value) => _stream.SetLength(value); diff --git a/src/SharpCompress/IO/IStreamStack.cs b/src/SharpCompress/IO/IStreamStack.cs index a652e3f1..cfc057fa 100644 --- a/src/SharpCompress/IO/IStreamStack.cs +++ b/src/SharpCompress/IO/IStreamStack.cs @@ -10,11 +10,9 @@ namespace SharpCompress.IO { public interface IStreamStack { - /// /// Returns the immediate underlying stream in the stack. /// Stream BaseStream(); - } } diff --git a/src/SharpCompress/IO/NonDisposingStream.cs b/src/SharpCompress/IO/NonDisposingStream.cs index 2e290b3e..51fabf68 100644 --- a/src/SharpCompress/IO/NonDisposingStream.cs +++ b/src/SharpCompress/IO/NonDisposingStream.cs @@ -216,9 +216,11 @@ internal class NonDisposingStream : Stream, IStreamStack } public int DefaultBufferSize { get; set; } + public Stream BaseStream() => _stream; public int BufferSize { get; set; } public int BufferPosition { get; set; } + public void SetPosition(long position) => throw new NotImplementedException(); } diff --git a/src/SharpCompress/IO/ReadOnlySubStream.cs b/src/SharpCompress/IO/ReadOnlySubStream.cs index e343b0e5..728b0512 100644 --- a/src/SharpCompress/IO/ReadOnlySubStream.cs +++ b/src/SharpCompress/IO/ReadOnlySubStream.cs @@ -23,7 +23,7 @@ internal partial class ReadOnlySubStream : Stream, IStreamStack { _stream = stream ?? throw new ArgumentNullException(nameof(stream)); _leaveOpen = leaveOpen; - + if (origin != null && stream.Position != origin.Value) { stream.Position = origin.Value; diff --git a/tests/SharpCompress.Test/WriterTests.cs b/tests/SharpCompress.Test/WriterTests.cs index a61f568c..5b6ae7ff 100644 --- a/tests/SharpCompress.Test/WriterTests.cs +++ b/tests/SharpCompress.Test/WriterTests.cs @@ -43,7 +43,10 @@ public class WriterTests : TestBase readerOptions.ArchiveEncoding.Default = encoding ?? Encoding.Default; - using var reader = ReaderFactory.OpenReader(new NonDisposingStream(stream), readerOptions); + using var reader = ReaderFactory.OpenReader( + new NonDisposingStream(stream), + readerOptions + ); reader.WriteAllToDirectory( SCRATCH_FILES_PATH, new ExtractionOptions { ExtractFullPath = true }