starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-24 07:54:39 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Adam Hathcock
2020-07-26 12:07:05 +01:00
committed by GitHub
parent 802662a165 c77ec59a28
commit b12e8e793f
19 changed files with 85 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/dotnetcore.yml vendored
View File

@@ -1,5 +1,5 @@
name: SharpCompress
on: [push]
on: [push, pull_request]
jobs:
build:
@@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.300
dotnet-version: 3.1.301
- run: dotnet run -p src/build/build.csproj
- uses: actions/upload-artifact@v2
with:

2
README.md
View File

@@ -1,6 +1,6 @@
# SharpCompress
SharpCompress is a compression library in pure C# for .NET Standard 1.3 and 2.0 that can unrar, un7zip, unzip, untar unbzip2 and ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip are implemented.
SharpCompress is a compression library in pure C# for .NET Standard 1.3 and 2.0 that can unrar, un7zip, unzip, untar unbzip2, ungzip, unlzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip/lzip are implemented.
The major feature is support for non-seekable streams so large files can be processed on the fly (i.e. download stream).

2
global.json
View File

@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.300"
"version": "3.1.301"
}
}

5
src/SharpCompress/Archives/IArchiveEntryExtensions.cs
View File

@@ -8,11 +8,6 @@ namespace SharpCompress.Archives
{
public static void WriteTo(this IArchiveEntry archiveEntry, Stream streamToWriteTo)
{
if (archiveEntry.Archive.Type == ArchiveType.Rar && archiveEntry.Archive.IsSolid)
{
throw new InvalidFormatException("Cannot use Archive random access on SOLID Rar files.");
}
if (archiveEntry.IsDirectory)
{
throw new ExtractionException("Entry is a file directory and cannot be extracted.");

5
src/SharpCompress/Archives/Rar/RarArchiveEntry.cs
View File

@@ -57,11 +57,6 @@ namespace SharpCompress.Archives.Rar
public Stream OpenEntryStream()
{
if (archive.IsSolid)
{
throw new InvalidOperationException("Use ExtractAllEntries to extract SOLID archives.");
}
if (IsRarV3)
{
return new RarStream(archive.UnpackV1.Value, FileHeader, new MultiVolumeReadOnlyStream(Parts.Cast<RarFilePart>(), archive));

8
src/SharpCompress/Common/ArchiveEncoding.cs
View File

@@ -27,9 +27,13 @@ namespace SharpCompress.Common
public Func<byte[], int, int, string>? CustomDecoder { get; set; }
public ArchiveEncoding()
: this(Encoding.Default, Encoding.Default)
{
Default = Encoding.GetEncoding(437);
Password = Encoding.GetEncoding(437);
}
public ArchiveEncoding(Encoding def, Encoding password)
{
Default = def;
Password = password;
}
#if NETSTANDARD1_3 || NETSTANDARD2_0 || NETSTANDARD2_1

2
src/SharpCompress/Common/Tar/TarFilePart.cs
View File

@@ -24,7 +24,7 @@ namespace SharpCompress.Common.Tar
if (_seekableStream != null)
{
_seekableStream.Position = Header.DataStartPosition!.Value;
return new ReadOnlySubStream(_seekableStream, Header.Size);
return new TarReadOnlySubStream(_seekableStream, Header.Size);
}
return Header.PackedStream;
}

22
src/SharpCompress/Common/Tar/TarReadOnlySubStream.cs
View File

@@ -20,22 +20,24 @@ namespace SharpCompress.Common.Tar
{
return;
}
_isDisposed = true;
if (disposing)
{
long skipBytes = _amountRead % 512;
if (skipBytes == 0)
// Ensure we read all remaining blocks for this entry.
Stream.Skip(BytesLeftToRead);
_amountRead += BytesLeftToRead;
// If the last block wasn't a full 512 bytes, skip the remaining padding bytes.
var bytesInLastBlock = _amountRead % 512;
if (bytesInLastBlock != 0)
{
return;
Stream.Skip(512 - bytesInLastBlock);
}
skipBytes = 512 - skipBytes;
if (skipBytes == 0)
{
return;
}
var buffer = new byte[skipBytes];
Stream.ReadFully(buffer);
}
base.Dispose(disposing);
}

2
src/build/Program.cs
View File

@@ -57,7 +57,7 @@ class Program
return Glob.Files(".", d);
}
foreach (var file in GetFiles("*.Tests/**/*.csproj"))
foreach (var file in GetFiles("**/*.Test.csproj"))
{
Run("dotnet", $"test {file} -c Release -f {framework} --no-restore --no-build");
}

6
tests/SharpCompress.Test/ArchiveTests.cs
View File

@@ -83,12 +83,6 @@ namespace SharpCompress.Test
});
}
}
catch (InvalidFormatException)
{
//rar SOLID test needs this
stream.ThrowOnDispose = false;
throw;
}
catch (IndexOutOfRangeException)
{
//SevenZipArchive_BZip2_Split test needs this

28
tests/SharpCompress.Test/Rar/RarArchiveTests.cs
View File

@@ -203,13 +203,13 @@ namespace SharpCompress.Test.Rar
[Fact]
public void Rar_Solid_ArchiveStreamRead()
{
Assert.Throws<InvalidFormatException>(() => ArchiveStreamRead("Rar.solid.rar"));
ArchiveStreamRead("Rar.solid.rar");
}
[Fact]
public void Rar5_Solid_ArchiveStreamRead()
{
Assert.Throws<InvalidFormatException>(() => ArchiveStreamRead("Rar5.solid.rar"));
ArchiveStreamRead("Rar5.solid.rar");
}
[Fact]
@@ -232,7 +232,7 @@ namespace SharpCompress.Test.Rar
"Rar.multi.part03.rar",
"Rar.multi.part04.rar",
"Rar.multi.part05.rar",
"Rar.multi.part06.rar"});
"Rar.multi.part06.rar"}, false);
}
[Fact]
@@ -243,14 +243,15 @@ namespace SharpCompress.Test.Rar
"Rar5.multi.part03.rar",
"Rar5.multi.part04.rar",
"Rar5.multi.part05.rar",
"Rar5.multi.part06.rar"});
"Rar5.multi.part06.rar"}, false);
}
private void DoRar_Multi_ArchiveStreamRead(string[] archives)
private void DoRar_Multi_ArchiveStreamRead(string[] archives, bool isSolid)
{
using (var archive = RarArchive.Open(archives.Select(s => Path.Combine(TEST_ARCHIVES_PATH, s))
.Select(File.OpenRead)))
{
Assert.Equal(archive.IsSolid, isSolid);
foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
{
entry.WriteToDirectory(SCRATCH_FILES_PATH, new ExtractionOptions()
@@ -260,7 +261,18 @@ namespace SharpCompress.Test.Rar
});
}
}
VerifyFiles();
}
[Fact]
public void Rar5_MultiSolid_ArchiveStreamRead()
{
DoRar_Multi_ArchiveStreamRead(new string[] {
"Rar.multi.solid.part01.rar",
"Rar.multi.solid.part02.rar",
"Rar.multi.solid.part03.rar",
"Rar.multi.solid.part04.rar",
"Rar.multi.solid.part05.rar",
"Rar.multi.solid.part06.rar"}, true);
}
[Fact]
@@ -332,13 +344,13 @@ namespace SharpCompress.Test.Rar
[Fact]
public void Rar_Solid_ArchiveFileRead()
{
Assert.Throws<InvalidFormatException>(() => ArchiveFileRead("Rar.solid.rar"));
ArchiveFileRead("Rar.solid.rar");
}
[Fact]
public void Rar5_Solid_ArchiveFileRead()
{
Assert.Throws<InvalidFormatException>(() => ArchiveFileRead("Rar5.solid.rar"));
ArchiveFileRead("Rar5.solid.rar");
}
[Fact]

2
tests/SharpCompress.Test/SharpCompress.Test.csproj
View File

@@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="Xunit.SkippableFact" Version="1.4.8" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />

40
tests/SharpCompress.Test/Tar/TarArchiveTests.cs
View File

@@ -248,5 +248,45 @@ namespace SharpCompress.Test.Tar
}
}
}
[Fact]
public void Tar_Read_One_At_A_Time()
{
var archiveEncoding = new ArchiveEncoding { Default = Encoding.UTF8, };
var tarWriterOptions = new TarWriterOptions(CompressionType.None, true) { ArchiveEncoding = archiveEncoding, };
var testBytes = Encoding.UTF8.GetBytes("This is a test.");
using (var memoryStream = new MemoryStream())
{
using (var tarWriter = new TarWriter(memoryStream, tarWriterOptions))
using (var testFileStream = new MemoryStream(testBytes))
{
tarWriter.Write("test1.txt", testFileStream);
testFileStream.Position = 0;
tarWriter.Write("test2.txt", testFileStream);
}
memoryStream.Position = 0;
var numberOfEntries = 0;
using (var archiveFactory = TarArchive.Open(memoryStream))
{
foreach (var entry in archiveFactory.Entries)
{
++numberOfEntries;
using (var tarEntryStream = entry.OpenEntryStream())
using (var testFileStream = new MemoryStream())
{
tarEntryStream.CopyTo(testFileStream);
Assert.Equal(testBytes.Length, testFileStream.Length);
}
}
}
Assert.Equal(2, numberOfEntries);
}
}
}
}

BIN
tests/TestArchives/Archives/Rar.multi.solid.part01.rar Normal file
View File

Binary file not shown.

BIN
tests/TestArchives/Archives/Rar.multi.solid.part02.rar Normal file
View File

Binary file not shown.

BIN
tests/TestArchives/Archives/Rar.multi.solid.part03.rar Normal file
View File

Binary file not shown.

BIN
tests/TestArchives/Archives/Rar.multi.solid.part04.rar Normal file
View File

Binary file not shown.

BIN
tests/TestArchives/Archives/Rar.multi.solid.part05.rar Normal file
View File

Binary file not shown.

BIN
tests/TestArchives/Archives/Rar.multi.solid.part06.rar Normal file
View File

Binary file not shown.