Skip to content

Reduce custom utilities for arrays/bytes #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamhathcock merged 12 commits into from
Oct 22, 2025
Merged

Reduce custom utilities for arrays/bytes #967

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e0d6cd9
Try to reduce custom functions for array/byte management
adamhathcock Oct 22, 2025
c823aca
optimize ReadFully and Skip
adamhathcock Oct 22, 2025
084fe72
Consolidate not null
adamhathcock Oct 22, 2025
d8797b6
remove do while
adamhathcock Oct 22, 2025
62bee15
fmt
adamhathcock Oct 22, 2025
249b8a9
add AI generated tests
adamhathcock Oct 22, 2025
513cd4f
some AI suggestions
adamhathcock Oct 22, 2025
83917d4
Merge remote-tracking branch 'origin/master' into adam/reduce-custom-…
adamhathcock Oct 22, 2025
a1dfa3d
xplat tests for path characters
adamhathcock Oct 22, 2025
00df8e9
add windows only compile constant
adamhathcock Oct 22, 2025
d1a540c
use windows instead of skippable fact
adamhathcock Oct 22, 2025
408f07e
Merge branch 'master' into adam/reduce-custom-utilities
adamhathcock Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/SharpCompress/Archives/ArchiveFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static IWritableArchive Create(ArchiveType type)
/// <param name="options"></param>
public static IArchive Open(string filePath, ReaderOptions? options = null)
{
filePath.CheckNotNullOrEmpty(nameof(filePath));
filePath.NotNullOrEmpty(nameof(filePath));
return Open(new FileInfo(filePath), options);
}

Expand All @@ -68,7 +68,7 @@ public static IArchive Open(FileInfo fileInfo, ReaderOptions? options = null)
/// <param name="options"></param>
public static IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? options = null)
{
fileInfos.CheckNotNull(nameof(fileInfos));
fileInfos.NotNull(nameof(fileInfos));
var filesArray = fileInfos.ToArray();
if (filesArray.Length == 0)
{
Expand All @@ -81,7 +81,7 @@ public static IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? opti
return Open(fileInfo, options);
}

fileInfo.CheckNotNull(nameof(fileInfo));
fileInfo.NotNull(nameof(fileInfo));
options ??= new ReaderOptions { LeaveStreamOpen = false };

return FindFactory<IMultiArchiveFactory>(fileInfo).Open(filesArray, options);
Expand All @@ -94,7 +94,7 @@ public static IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? opti
/// <param name="options"></param>
public static IArchive Open(IEnumerable<Stream> streams, ReaderOptions? options = null)
{
streams.CheckNotNull(nameof(streams));
streams.NotNull(nameof(streams));
var streamsArray = streams.ToArray();
if (streamsArray.Length == 0)
{
Expand All @@ -107,7 +107,7 @@ public static IArchive Open(IEnumerable<Stream> streams, ReaderOptions? options
return Open(firstStream, options);
}

firstStream.CheckNotNull(nameof(firstStream));
firstStream.NotNull(nameof(firstStream));
options ??= new ReaderOptions();

return FindFactory<IMultiArchiveFactory>(firstStream).Open(streamsArray, options);
Expand All @@ -129,15 +129,15 @@ public static void WriteToDirectory(
private static T FindFactory<T>(FileInfo finfo)
where T : IFactory
{
finfo.CheckNotNull(nameof(finfo));
finfo.NotNull(nameof(finfo));
using Stream stream = finfo.OpenRead();
return FindFactory<T>(stream);
}

private static T FindFactory<T>(Stream stream)
where T : IFactory
{
stream.CheckNotNull(nameof(stream));
stream.NotNull(nameof(stream));
if (!stream.CanRead || !stream.CanSeek)
{
throw new ArgumentException("Stream should be readable and seekable");
Expand Down Expand Up @@ -172,7 +172,7 @@ public static bool IsArchive(
int bufferSize = ReaderOptions.DefaultBufferSize
)
{
filePath.CheckNotNullOrEmpty(nameof(filePath));
filePath.NotNullOrEmpty(nameof(filePath));
using Stream s = File.OpenRead(filePath);
return IsArchive(s, out type, bufferSize);
}
Expand All @@ -184,7 +184,7 @@ public static bool IsArchive(
)
{
type = null;
stream.CheckNotNull(nameof(stream));
stream.NotNull(nameof(stream));

if (!stream.CanRead || !stream.CanSeek)
{
Expand Down Expand Up @@ -215,7 +215,7 @@ public static bool IsArchive(
/// <returns></returns>
public static IEnumerable<string> GetFileParts(string part1)
{
part1.CheckNotNullOrEmpty(nameof(part1));
part1.NotNullOrEmpty(nameof(part1));
return GetFileParts(new FileInfo(part1)).Select(a => a.FullName);
}

Expand All @@ -226,7 +226,7 @@ public static IEnumerable<string> GetFileParts(string part1)
/// <returns></returns>
public static IEnumerable<FileInfo> GetFileParts(FileInfo part1)
{
part1.CheckNotNull(nameof(part1));
part1.NotNull(nameof(part1));
yield return part1;

foreach (var factory in Factory.Factories.OfType<IFactory>())
Expand Down
10 changes: 5 additions & 5 deletions src/SharpCompress/Archives/GZip/GZipArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
/// <param name="readerOptions"></param>
public static GZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
{
filePath.CheckNotNullOrEmpty(nameof(filePath));
filePath.NotNullOrEmpty(nameof(filePath));
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
}

Expand All @@ -32,7 +32,7 @@ public static GZipArchive Open(string filePath, ReaderOptions? readerOptions = n
/// <param name="readerOptions"></param>
public static GZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
fileInfo.CheckNotNull(nameof(fileInfo));
fileInfo.NotNull(nameof(fileInfo));
return new GZipArchive(
new SourceStream(
fileInfo,
Expand All @@ -52,7 +52,7 @@ public static GZipArchive Open(
ReaderOptions? readerOptions = null
)
{
fileInfos.CheckNotNull(nameof(fileInfos));
fileInfos.NotNull(nameof(fileInfos));
var files = fileInfos.ToArray();
return new GZipArchive(
new SourceStream(
Expand All @@ -70,7 +70,7 @@ public static GZipArchive Open(
/// <param name="readerOptions"></param>
public static GZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
streams.CheckNotNull(nameof(streams));
streams.NotNull(nameof(streams));
var strms = streams.ToArray();
return new GZipArchive(
new SourceStream(
Expand All @@ -88,7 +88,7 @@ public static GZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? reade
/// <param name="readerOptions"></param>
public static GZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
{
stream.CheckNotNull(nameof(stream));
stream.NotNull(nameof(stream));

if (stream is not { CanSeek: true })
{
Expand Down
2 changes: 1 addition & 1 deletion src/SharpCompress/Archives/IArchiveEntryExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void WriteTo(this IArchiveEntry archiveEntry, Stream streamToWrite
using (entryStream)
{
using Stream s = new ListeningStream(streamListener, entryStream);
s.TransferTo(streamToWriteTo);
s.CopyTo(streamToWriteTo);
}
streamListener.FireEntryExtractionEnd(archiveEntry);
}
Expand Down
10 changes: 5 additions & 5 deletions src/SharpCompress/Archives/Rar/RarArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ protected override IReader CreateReaderForSolidExtraction()
/// <param name="options"></param>
public static RarArchive Open(string filePath, ReaderOptions? options = null)
{
filePath.CheckNotNullOrEmpty(nameof(filePath));
filePath.NotNullOrEmpty(nameof(filePath));
var fileInfo = new FileInfo(filePath);
return new RarArchive(
new SourceStream(
Expand All @@ -113,7 +113,7 @@ public static RarArchive Open(string filePath, ReaderOptions? options = null)
/// <param name="options"></param>
public static RarArchive Open(FileInfo fileInfo, ReaderOptions? options = null)
{
fileInfo.CheckNotNull(nameof(fileInfo));
fileInfo.NotNull(nameof(fileInfo));
return new RarArchive(
new SourceStream(
fileInfo,
Expand All @@ -130,7 +130,7 @@ public static RarArchive Open(FileInfo fileInfo, ReaderOptions? options = null)
/// <param name="options"></param>
public static RarArchive Open(Stream stream, ReaderOptions? options = null)
{
stream.CheckNotNull(nameof(stream));
stream.NotNull(nameof(stream));

if (stream is not { CanSeek: true })
{
Expand All @@ -150,7 +150,7 @@ public static RarArchive Open(
ReaderOptions? readerOptions = null
)
{
fileInfos.CheckNotNull(nameof(fileInfos));
fileInfos.NotNull(nameof(fileInfos));
var files = fileInfos.ToArray();
return new RarArchive(
new SourceStream(
Expand All @@ -168,7 +168,7 @@ public static RarArchive Open(
/// <param name="readerOptions"></param>
public static RarArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
streams.CheckNotNull(nameof(streams));
streams.NotNull(nameof(streams));
var strms = streams.ToArray();
return new RarArchive(
new SourceStream(
Expand Down
10 changes: 5 additions & 5 deletions src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVol
/// <param name="readerOptions"></param>
public static SevenZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
{
filePath.CheckNotNullOrEmpty("filePath");
filePath.NotNullOrEmpty("filePath");
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
}

Expand All @@ -32,7 +32,7 @@ public static SevenZipArchive Open(string filePath, ReaderOptions? readerOptions
/// <param name="readerOptions"></param>
public static SevenZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
fileInfo.CheckNotNull("fileInfo");
fileInfo.NotNull("fileInfo");
return new SevenZipArchive(
new SourceStream(
fileInfo,
Expand All @@ -52,7 +52,7 @@ public static SevenZipArchive Open(
ReaderOptions? readerOptions = null
)
{
fileInfos.CheckNotNull(nameof(fileInfos));
fileInfos.NotNull(nameof(fileInfos));
var files = fileInfos.ToArray();
return new SevenZipArchive(
new SourceStream(
Expand All @@ -73,7 +73,7 @@ public static SevenZipArchive Open(
ReaderOptions? readerOptions = null
)
{
streams.CheckNotNull(nameof(streams));
streams.NotNull(nameof(streams));
var strms = streams.ToArray();
return new SevenZipArchive(
new SourceStream(
Expand All @@ -91,7 +91,7 @@ public static SevenZipArchive Open(
/// <param name="readerOptions"></param>
public static SevenZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
{
stream.CheckNotNull("stream");
stream.NotNull("stream");

if (stream is not { CanSeek: true })
{
Expand Down
12 changes: 6 additions & 6 deletions src/SharpCompress/Archives/Tar/TarArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
/// <param name="readerOptions"></param>
public static TarArchive Open(string filePath, ReaderOptions? readerOptions = null)
{
filePath.CheckNotNullOrEmpty(nameof(filePath));
filePath.NotNullOrEmpty(nameof(filePath));
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
}

Expand All @@ -33,7 +33,7 @@ public static TarArchive Open(string filePath, ReaderOptions? readerOptions = nu
/// <param name="readerOptions"></param>
public static TarArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
fileInfo.CheckNotNull(nameof(fileInfo));
fileInfo.NotNull(nameof(fileInfo));
return new TarArchive(
new SourceStream(
fileInfo,
Expand All @@ -53,7 +53,7 @@ public static TarArchive Open(
ReaderOptions? readerOptions = null
)
{
fileInfos.CheckNotNull(nameof(fileInfos));
fileInfos.NotNull(nameof(fileInfos));
var files = fileInfos.ToArray();
return new TarArchive(
new SourceStream(
Expand All @@ -71,7 +71,7 @@ public static TarArchive Open(
/// <param name="readerOptions"></param>
public static TarArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
streams.CheckNotNull(nameof(streams));
streams.NotNull(nameof(streams));
var strms = streams.ToArray();
return new TarArchive(
new SourceStream(
Expand All @@ -89,7 +89,7 @@ public static TarArchive Open(IEnumerable<Stream> streams, ReaderOptions? reader
/// <param name="readerOptions"></param>
public static TarArchive Open(Stream stream, ReaderOptions? readerOptions = null)
{
stream.CheckNotNull(nameof(stream));
stream.NotNull(nameof(stream));

if (stream is not { CanSeek: true })
{
Expand Down Expand Up @@ -178,7 +178,7 @@ var header in TarHeaderFactory.ReadHeader(
using (var entryStream = entry.OpenEntryStream())
{
using var memoryStream = new MemoryStream();
entryStream.TransferTo(memoryStream);
entryStream.CopyTo(memoryStream);
memoryStream.Position = 0;
var bytes = memoryStream.ToArray();

Expand Down
10 changes: 5 additions & 5 deletions src/SharpCompress/Archives/Zip/ZipArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ internal ZipArchive(SourceStream sourceStream)
/// <param name="readerOptions"></param>
public static ZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
{
filePath.CheckNotNullOrEmpty(nameof(filePath));
filePath.NotNull(nameof(filePath));
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
}

Expand All @@ -54,7 +54,7 @@ public static ZipArchive Open(string filePath, ReaderOptions? readerOptions = nu
/// <param name="readerOptions"></param>
public static ZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
fileInfo.CheckNotNull(nameof(fileInfo));
fileInfo.NotNull(nameof(fileInfo));
return new ZipArchive(
new SourceStream(
fileInfo,
Expand All @@ -74,7 +74,7 @@ public static ZipArchive Open(
ReaderOptions? readerOptions = null
)
{
fileInfos.CheckNotNull(nameof(fileInfos));
fileInfos.NotNull(nameof(fileInfos));
var files = fileInfos.ToArray();
return new ZipArchive(
new SourceStream(
Expand All @@ -92,7 +92,7 @@ public static ZipArchive Open(
/// <param name="readerOptions"></param>
public static ZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
streams.CheckNotNull(nameof(streams));
streams.NotNull(nameof(streams));
var strms = streams.ToArray();
return new ZipArchive(
new SourceStream(
Expand All @@ -110,7 +110,7 @@ public static ZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? reader
/// <param name="readerOptions"></param>
public static ZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
{
stream.CheckNotNull(nameof(stream));
stream.NotNull(nameof(stream));

if (stream is not { CanSeek: true })
{
Expand Down
18 changes: 15 additions & 3 deletions src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ private void UnpWriteBuf()
else
//x memcpy(Mem,Window+BlockStart,BlockLength);
{
Utility.Copy(Window, BlockStart, Mem, 0, BlockLength);
Buffer.BlockCopy(Window, (int)BlockStart, Mem, 0, (int)BlockLength);
}
}
else
Expand All @@ -427,9 +427,21 @@ private void UnpWriteBuf()
else
{
//x memcpy(Mem,Window+BlockStart,FirstPartLength);
Utility.Copy(Window, BlockStart, Mem, 0, FirstPartLength);
Buffer.BlockCopy(
Window,
(int)BlockStart,
Mem,
0,
(int)FirstPartLength
);
//x memcpy(Mem+FirstPartLength,Window,BlockEnd);
Utility.Copy(Window, 0, Mem, FirstPartLength, BlockEnd);
Buffer.BlockCopy(
Window,
0,
Mem,
(int)FirstPartLength,
(int)BlockEnd
);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/SharpCompress/Factories/Factory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static Factory()
/// <exception cref="ArgumentNullException"><paramref name="factory"/> must not be null.</exception>
public static void RegisterFactory(Factory factory)
{
factory.CheckNotNull(nameof(factory));
factory.NotNull(nameof(factory));

_factories.Add(factory);
}
Expand Down
2 changes: 1 addition & 1 deletion src/SharpCompress/LazyReadOnlyCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections;
using System.Collections.Generic;

namespace SharpCompress.Helpers;
namespace SharpCompress;

internal sealed class LazyReadOnlyCollection<T> : ICollection<T>
{
Expand Down
Loading
Loading