Skip to content

Commit 5f0d042

Browse files
adamhathcockadamhathcock
authored
Merge pull request #967 from adamhathcock/adam/reduce-custom-utilities
Reduce custom utilities for arrays/bytes
2 parents 3b768b1 + 408f07e commit 5f0d042

28 files changed

Lines changed: 894 additions & 246 deletions

‎Directory.Packages.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
1313
<PackageVersion Include="xunit" Version="2.9.3" />
1414
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
15-
<PackageVersion Include="xunit.SkippableFact" Version="1.5.23" />
1615
<PackageVersion Include="ZstdSharp.Port" Version="0.8.6" />
1716
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1817
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />

‎src/SharpCompress/Archives/ArchiveFactory.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static IWritableArchive Create(ArchiveType type)
4545
/// <param name="options"></param>
4646
public static IArchive Open(string filePath, ReaderOptions? options = null)
4747
{
48-
filePath.CheckNotNullOrEmpty(nameof(filePath));
48+
filePath.NotNullOrEmpty(nameof(filePath));
4949
return Open(new FileInfo(filePath), options);
5050
}
5151

@@ -68,7 +68,7 @@ public static IArchive Open(FileInfo fileInfo, ReaderOptions? options = null)
6868
/// <param name="options"></param>
6969
public static IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? options = null)
7070
{
71-
fileInfos.CheckNotNull(nameof(fileInfos));
71+
fileInfos.NotNull(nameof(fileInfos));
7272
var filesArray = fileInfos.ToArray();
7373
if (filesArray.Length == 0)
7474
{
@@ -81,7 +81,7 @@ public static IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? opti
8181
return Open(fileInfo, options);
8282
}
8383

84-
fileInfo.CheckNotNull(nameof(fileInfo));
84+
fileInfo.NotNull(nameof(fileInfo));
8585
options ??= new ReaderOptions { LeaveStreamOpen = false };
8686

8787
return FindFactory<IMultiArchiveFactory>(fileInfo).Open(filesArray, options);
@@ -94,7 +94,7 @@ public static IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? opti
9494
/// <param name="options"></param>
9595
public static IArchive Open(IEnumerable<Stream> streams, ReaderOptions? options = null)
9696
{
97-
streams.CheckNotNull(nameof(streams));
97+
streams.NotNull(nameof(streams));
9898
var streamsArray = streams.ToArray();
9999
if (streamsArray.Length == 0)
100100
{
@@ -107,7 +107,7 @@ public static IArchive Open(IEnumerable<Stream> streams, ReaderOptions? options
107107
return Open(firstStream, options);
108108
}
109109

110-
firstStream.CheckNotNull(nameof(firstStream));
110+
firstStream.NotNull(nameof(firstStream));
111111
options ??= new ReaderOptions();
112112

113113
return FindFactory<IMultiArchiveFactory>(firstStream).Open(streamsArray, options);
@@ -129,15 +129,15 @@ public static void WriteToDirectory(
129129
private static T FindFactory<T>(FileInfo finfo)
130130
where T : IFactory
131131
{
132-
finfo.CheckNotNull(nameof(finfo));
132+
finfo.NotNull(nameof(finfo));
133133
using Stream stream = finfo.OpenRead();
134134
return FindFactory<T>(stream);
135135
}
136136

137137
private static T FindFactory<T>(Stream stream)
138138
where T : IFactory
139139
{
140-
stream.CheckNotNull(nameof(stream));
140+
stream.NotNull(nameof(stream));
141141
if (!stream.CanRead || !stream.CanSeek)
142142
{
143143
throw new ArgumentException("Stream should be readable and seekable");
@@ -172,7 +172,7 @@ public static bool IsArchive(
172172
int bufferSize = ReaderOptions.DefaultBufferSize
173173
)
174174
{
175-
filePath.CheckNotNullOrEmpty(nameof(filePath));
175+
filePath.NotNullOrEmpty(nameof(filePath));
176176
using Stream s = File.OpenRead(filePath);
177177
return IsArchive(s, out type, bufferSize);
178178
}
@@ -184,7 +184,7 @@ public static bool IsArchive(
184184
)
185185
{
186186
type = null;
187-
stream.CheckNotNull(nameof(stream));
187+
stream.NotNull(nameof(stream));
188188

189189
if (!stream.CanRead || !stream.CanSeek)
190190
{
@@ -215,7 +215,7 @@ public static bool IsArchive(
215215
/// <returns></returns>
216216
public static IEnumerable<string> GetFileParts(string part1)
217217
{
218-
part1.CheckNotNullOrEmpty(nameof(part1));
218+
part1.NotNullOrEmpty(nameof(part1));
219219
return GetFileParts(new FileInfo(part1)).Select(a => a.FullName);
220220
}
221221

@@ -226,7 +226,7 @@ public static IEnumerable<string> GetFileParts(string part1)
226226
/// <returns></returns>
227227
public static IEnumerable<FileInfo> GetFileParts(FileInfo part1)
228228
{
229-
part1.CheckNotNull(nameof(part1));
229+
part1.NotNull(nameof(part1));
230230
yield return part1;
231231

232232
foreach (var factory in Factory.Factories.OfType<IFactory>())

‎src/SharpCompress/Archives/GZip/GZipArchive.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class GZipArchive : AbstractWritableArchive<GZipArchiveEntry, GZipVolume>
2121
/// <param name="readerOptions"></param>
2222
public static GZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
2323
{
24-
filePath.CheckNotNullOrEmpty(nameof(filePath));
24+
filePath.NotNullOrEmpty(nameof(filePath));
2525
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
2626
}
2727

@@ -32,7 +32,7 @@ public static GZipArchive Open(string filePath, ReaderOptions? readerOptions = n
3232
/// <param name="readerOptions"></param>
3333
public static GZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
3434
{
35-
fileInfo.CheckNotNull(nameof(fileInfo));
35+
fileInfo.NotNull(nameof(fileInfo));
3636
return new GZipArchive(
3737
new SourceStream(
3838
fileInfo,
@@ -52,7 +52,7 @@ public static GZipArchive Open(
5252
ReaderOptions? readerOptions = null
5353
)
5454
{
55-
fileInfos.CheckNotNull(nameof(fileInfos));
55+
fileInfos.NotNull(nameof(fileInfos));
5656
var files = fileInfos.ToArray();
5757
return new GZipArchive(
5858
new SourceStream(
@@ -70,7 +70,7 @@ public static GZipArchive Open(
7070
/// <param name="readerOptions"></param>
7171
public static GZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
7272
{
73-
streams.CheckNotNull(nameof(streams));
73+
streams.NotNull(nameof(streams));
7474
var strms = streams.ToArray();
7575
return new GZipArchive(
7676
new SourceStream(
@@ -88,7 +88,7 @@ public static GZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? reade
8888
/// <param name="readerOptions"></param>
8989
public static GZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
9090
{
91-
stream.CheckNotNull(nameof(stream));
91+
stream.NotNull(nameof(stream));
9292

9393
if (stream is not { CanSeek: true })
9494
{

‎src/SharpCompress/Archives/IArchiveEntryExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void WriteTo(this IArchiveEntry archiveEntry, Stream streamToWrite
2525
using (entryStream)
2626
{
2727
using Stream s = new ListeningStream(streamListener, entryStream);
28-
s.TransferTo(streamToWriteTo);
28+
s.CopyTo(streamToWriteTo);
2929
}
3030
streamListener.FireEntryExtractionEnd(archiveEntry);
3131
}

‎src/SharpCompress/Archives/Rar/RarArchive.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected override IReader CreateReaderForSolidExtraction()
9595
/// <param name="options"></param>
9696
public static RarArchive Open(string filePath, ReaderOptions? options = null)
9797
{
98-
filePath.CheckNotNullOrEmpty(nameof(filePath));
98+
filePath.NotNullOrEmpty(nameof(filePath));
9999
var fileInfo = new FileInfo(filePath);
100100
return new RarArchive(
101101
new SourceStream(
@@ -113,7 +113,7 @@ public static RarArchive Open(string filePath, ReaderOptions? options = null)
113113
/// <param name="options"></param>
114114
public static RarArchive Open(FileInfo fileInfo, ReaderOptions? options = null)
115115
{
116-
fileInfo.CheckNotNull(nameof(fileInfo));
116+
fileInfo.NotNull(nameof(fileInfo));
117117
return new RarArchive(
118118
new SourceStream(
119119
fileInfo,
@@ -130,7 +130,7 @@ public static RarArchive Open(FileInfo fileInfo, ReaderOptions? options = null)
130130
/// <param name="options"></param>
131131
public static RarArchive Open(Stream stream, ReaderOptions? options = null)
132132
{
133-
stream.CheckNotNull(nameof(stream));
133+
stream.NotNull(nameof(stream));
134134

135135
if (stream is not { CanSeek: true })
136136
{
@@ -150,7 +150,7 @@ public static RarArchive Open(
150150
ReaderOptions? readerOptions = null
151151
)
152152
{
153-
fileInfos.CheckNotNull(nameof(fileInfos));
153+
fileInfos.NotNull(nameof(fileInfos));
154154
var files = fileInfos.ToArray();
155155
return new RarArchive(
156156
new SourceStream(
@@ -168,7 +168,7 @@ public static RarArchive Open(
168168
/// <param name="readerOptions"></param>
169169
public static RarArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
170170
{
171-
streams.CheckNotNull(nameof(streams));
171+
streams.NotNull(nameof(streams));
172172
var strms = streams.ToArray();
173173
return new RarArchive(
174174
new SourceStream(

‎src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, SevenZipVol
2121
/// <param name="readerOptions"></param>
2222
public static SevenZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
2323
{
24-
filePath.CheckNotNullOrEmpty("filePath");
24+
filePath.NotNullOrEmpty("filePath");
2525
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
2626
}
2727

@@ -32,7 +32,7 @@ public static SevenZipArchive Open(string filePath, ReaderOptions? readerOptions
3232
/// <param name="readerOptions"></param>
3333
public static SevenZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
3434
{
35-
fileInfo.CheckNotNull("fileInfo");
35+
fileInfo.NotNull("fileInfo");
3636
return new SevenZipArchive(
3737
new SourceStream(
3838
fileInfo,
@@ -52,7 +52,7 @@ public static SevenZipArchive Open(
5252
ReaderOptions? readerOptions = null
5353
)
5454
{
55-
fileInfos.CheckNotNull(nameof(fileInfos));
55+
fileInfos.NotNull(nameof(fileInfos));
5656
var files = fileInfos.ToArray();
5757
return new SevenZipArchive(
5858
new SourceStream(
@@ -73,7 +73,7 @@ public static SevenZipArchive Open(
7373
ReaderOptions? readerOptions = null
7474
)
7575
{
76-
streams.CheckNotNull(nameof(streams));
76+
streams.NotNull(nameof(streams));
7777
var strms = streams.ToArray();
7878
return new SevenZipArchive(
7979
new SourceStream(
@@ -91,7 +91,7 @@ public static SevenZipArchive Open(
9191
/// <param name="readerOptions"></param>
9292
public static SevenZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
9393
{
94-
stream.CheckNotNull("stream");
94+
stream.NotNull("stream");
9595

9696
if (stream is not { CanSeek: true })
9797
{

‎src/SharpCompress/Archives/Tar/TarArchive.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class TarArchive : AbstractWritableArchive<TarArchiveEntry, TarVolume>
2222
/// <param name="readerOptions"></param>
2323
public static TarArchive Open(string filePath, ReaderOptions? readerOptions = null)
2424
{
25-
filePath.CheckNotNullOrEmpty(nameof(filePath));
25+
filePath.NotNullOrEmpty(nameof(filePath));
2626
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
2727
}
2828

@@ -33,7 +33,7 @@ public static TarArchive Open(string filePath, ReaderOptions? readerOptions = nu
3333
/// <param name="readerOptions"></param>
3434
public static TarArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
3535
{
36-
fileInfo.CheckNotNull(nameof(fileInfo));
36+
fileInfo.NotNull(nameof(fileInfo));
3737
return new TarArchive(
3838
new SourceStream(
3939
fileInfo,
@@ -53,7 +53,7 @@ public static TarArchive Open(
5353
ReaderOptions? readerOptions = null
5454
)
5555
{
56-
fileInfos.CheckNotNull(nameof(fileInfos));
56+
fileInfos.NotNull(nameof(fileInfos));
5757
var files = fileInfos.ToArray();
5858
return new TarArchive(
5959
new SourceStream(
@@ -71,7 +71,7 @@ public static TarArchive Open(
7171
/// <param name="readerOptions"></param>
7272
public static TarArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
7373
{
74-
streams.CheckNotNull(nameof(streams));
74+
streams.NotNull(nameof(streams));
7575
var strms = streams.ToArray();
7676
return new TarArchive(
7777
new SourceStream(
@@ -89,7 +89,7 @@ public static TarArchive Open(IEnumerable<Stream> streams, ReaderOptions? reader
8989
/// <param name="readerOptions"></param>
9090
public static TarArchive Open(Stream stream, ReaderOptions? readerOptions = null)
9191
{
92-
stream.CheckNotNull(nameof(stream));
92+
stream.NotNull(nameof(stream));
9393

9494
if (stream is not { CanSeek: true })
9595
{
@@ -178,7 +178,7 @@ var header in TarHeaderFactory.ReadHeader(
178178
using (var entryStream = entry.OpenEntryStream())
179179
{
180180
using var memoryStream = new MemoryStream();
181-
entryStream.TransferTo(memoryStream);
181+
entryStream.CopyTo(memoryStream);
182182
memoryStream.Position = 0;
183183
var bytes = memoryStream.ToArray();
184184

‎src/SharpCompress/Archives/Zip/ZipArchive.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ internal ZipArchive(SourceStream sourceStream)
4343
/// <param name="readerOptions"></param>
4444
public static ZipArchive Open(string filePath, ReaderOptions? readerOptions = null)
4545
{
46-
filePath.CheckNotNullOrEmpty(nameof(filePath));
46+
filePath.NotNullOrEmpty(nameof(filePath));
4747
return Open(new FileInfo(filePath), readerOptions ?? new ReaderOptions());
4848
}
4949

@@ -54,7 +54,7 @@ public static ZipArchive Open(string filePath, ReaderOptions? readerOptions = nu
5454
/// <param name="readerOptions"></param>
5555
public static ZipArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
5656
{
57-
fileInfo.CheckNotNull(nameof(fileInfo));
57+
fileInfo.NotNull(nameof(fileInfo));
5858
return new ZipArchive(
5959
new SourceStream(
6060
fileInfo,
@@ -74,7 +74,7 @@ public static ZipArchive Open(
7474
ReaderOptions? readerOptions = null
7575
)
7676
{
77-
fileInfos.CheckNotNull(nameof(fileInfos));
77+
fileInfos.NotNull(nameof(fileInfos));
7878
var files = fileInfos.ToArray();
7979
return new ZipArchive(
8080
new SourceStream(
@@ -92,7 +92,7 @@ public static ZipArchive Open(
9292
/// <param name="readerOptions"></param>
9393
public static ZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
9494
{
95-
streams.CheckNotNull(nameof(streams));
95+
streams.NotNull(nameof(streams));
9696
var strms = streams.ToArray();
9797
return new ZipArchive(
9898
new SourceStream(
@@ -110,7 +110,7 @@ public static ZipArchive Open(IEnumerable<Stream> streams, ReaderOptions? reader
110110
/// <param name="readerOptions"></param>
111111
public static ZipArchive Open(Stream stream, ReaderOptions? readerOptions = null)
112112
{
113-
stream.CheckNotNull(nameof(stream));
113+
stream.NotNull(nameof(stream));
114114

115115
if (stream is not { CanSeek: true })
116116
{

‎src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ private void UnpWriteBuf()
413413
else
414414
//x memcpy(Mem,Window+BlockStart,BlockLength);
415415
{
416-
Utility.Copy(Window, BlockStart, Mem, 0, BlockLength);
416+
Buffer.BlockCopy(Window, (int)BlockStart, Mem, 0, (int)BlockLength);
417417
}
418418
}
419419
else
@@ -427,9 +427,21 @@ private void UnpWriteBuf()
427427
else
428428
{
429429
//x memcpy(Mem,Window+BlockStart,FirstPartLength);
430-
Utility.Copy(Window, BlockStart, Mem, 0, FirstPartLength);
430+
Buffer.BlockCopy(
431+
Window,
432+
(int)BlockStart,
433+
Mem,
434+
0,
435+
(int)FirstPartLength
436+
);
431437
//x memcpy(Mem+FirstPartLength,Window,BlockEnd);
432-
Utility.Copy(Window, 0, Mem, FirstPartLength, BlockEnd);
438+
Buffer.BlockCopy(
439+
Window,
440+
0,
441+
Mem,
442+
(int)FirstPartLength,
443+
(int)BlockEnd
444+
);
433445
}
434446
}
435447

‎src/SharpCompress/Factories/Factory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static Factory()
3434
/// <exception cref="ArgumentNullException"><paramref name="factory"/> must not be null.</exception>
3535
public static void RegisterFactory(Factory factory)
3636
{
37-
factory.CheckNotNull(nameof(factory));
37+
factory.NotNull(nameof(factory));
3838

3939
_factories.Add(factory);
4040
}

0 commit comments

Comments
 (0)