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

Use soft tabs

Browse Source
This commit is contained in:
Knut Ørland
2018-10-04 13:13:14 +02:00
parent 6dd5da48f7
commit 53ad00cdc4
3 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SharpCompress/Common/EntryStream.cs
View File

@@ -48,7 +48,7 @@ namespace SharpCompress.Common
public override bool CanWrite => false;
public override void Flush() {
}
}
public override long Length => _stream.Length;

74
tests/SharpCompress.Test/Mocks/FlushOnDisposeStream.cs
View File

@@ -3,55 +3,55 @@ using System.IO;
namespace SharpCompress.Test.Mocks
{
// This is a simplified version of CryptoStream that always flushes the inner stream on Dispose to trigger an error in EntryStream
// CryptoStream doesn't always trigger the Flush, so this class is used instead
// See https://referencesource.microsoft.com/#mscorlib/system/security/cryptography/cryptostream.cs,141
// This is a simplified version of CryptoStream that always flushes the inner stream on Dispose to trigger an error in EntryStream
// CryptoStream doesn't always trigger the Flush, so this class is used instead
// See https://referencesource.microsoft.com/#mscorlib/system/security/cryptography/cryptostream.cs,141
public class FlushOnDisposeStream : Stream, IDisposable
{
private Stream inner;
public class FlushOnDisposeStream : Stream, IDisposable
{
private Stream inner;
public FlushOnDisposeStream(Stream innerStream) {
this.inner = innerStream;
}
public FlushOnDisposeStream(Stream innerStream) {
this.inner = innerStream;
}
public override bool CanRead => this.inner.CanRead;
public override bool CanRead => this.inner.CanRead;
public override bool CanSeek => false;
public override bool CanSeek => false;
public override bool CanWrite => false;
public override bool CanWrite => false;
public override long Length => this.inner.Length;
public override long Length => this.inner.Length;
public override long Position { get => this.inner.Position; set => this.inner.Position = value; }
public override long Position { get => this.inner.Position; set => this.inner.Position = value; }
public override void Flush() {
throw new NotImplementedException();
}
public override void Flush() {
throw new NotImplementedException();
}
public override int Read(byte[] buffer, int offset, int count) {
return this.inner.Read(buffer, offset, count);
}
public override int Read(byte[] buffer, int offset, int count) {
return this.inner.Read(buffer, offset, count);
}
public override long Seek(long offset, SeekOrigin origin) {
throw new NotImplementedException();
}
public override long Seek(long offset, SeekOrigin origin) {
throw new NotImplementedException();
}
public override void SetLength(long value) {
throw new NotImplementedException();
}
public override void SetLength(long value) {
throw new NotImplementedException();
}
public override void Write(byte[] buffer, int offset, int count) {
throw new NotImplementedException();
}
public override void Write(byte[] buffer, int offset, int count) {
throw new NotImplementedException();
}
protected override void Dispose(bool disposing) {
if(disposing) {
this.inner.Flush();
this.inner.Close();
}
protected override void Dispose(bool disposing) {
if(disposing) {
this.inner.Flush();
this.inner.Close();
}
base.Dispose(disposing);
}
}
base.Dispose(disposing);
}
}
}

42
tests/SharpCompress.Test/Tar/TarReaderTests.cs
View File

@@ -161,30 +161,30 @@ namespace SharpCompress.Test.Tar
}
}
[Fact]
public void Tar_With_TarGz_With_Flushed_EntryStream()
{
string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsTarGz.tar");
using(Stream stream = File.OpenRead(archiveFullPath))
using(IReader reader = ReaderFactory.Open(stream))
{
Assert.True(reader.MoveToNextEntry());
Assert.Equal("inner.tar.gz", reader.Entry.Key);
[Fact]
public void Tar_With_TarGz_With_Flushed_EntryStream()
{
string archiveFullPath = Path.Combine(TEST_ARCHIVES_PATH, "Tar.ContainsTarGz.tar");
using(Stream stream = File.OpenRead(archiveFullPath))
using(IReader reader = ReaderFactory.Open(stream))
{
Assert.True(reader.MoveToNextEntry());
Assert.Equal("inner.tar.gz", reader.Entry.Key);
using(var entryStream = reader.OpenEntryStream()) {
using(var entryStream = reader.OpenEntryStream()) {
using(FlushOnDisposeStream flushingStream = new FlushOnDisposeStream(entryStream)) {
using(FlushOnDisposeStream flushingStream = new FlushOnDisposeStream(entryStream)) {
// Extract inner.tar.gz
using(var innerReader = ReaderFactory.Open(flushingStream)) {
// Extract inner.tar.gz
using(var innerReader = ReaderFactory.Open(flushingStream)) {
Assert.True(innerReader.MoveToNextEntry());
Assert.Equal("test", innerReader.Entry.Key);
Assert.True(innerReader.MoveToNextEntry());
Assert.Equal("test", innerReader.Entry.Key);
}
}
}
}
}
}
}
}
}
}
}
}
}