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

Little more clean up

Browse Source
This commit is contained in:
Adam Hathcock
2013-12-23 12:29:41 +00:00
parent 66ffc82d41
commit 2100d49cef
5 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SharpCompress/Archive/AbstractArchive.cs
View File

@@ -40,8 +40,7 @@ namespace SharpCompress.Archive
internal AbstractArchive(ArchiveType type, IEnumerable<Stream> streams, Options options)
{
Type = type;
lazyVolumes =
new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select(CheckStreams), options));
lazyVolumes = new LazyReadOnlyCollection<TVolume>(LoadVolumes(streams.Select(CheckStreams), options));
lazyEntries = new LazyReadOnlyCollection<TEntry>(LoadEntries(Volumes));
}
@@ -51,6 +50,7 @@ namespace SharpCompress.Archive
lazyVolumes = new LazyReadOnlyCollection<TVolume>(Enumerable.Empty<TVolume>());
lazyEntries = new LazyReadOnlyCollection<TEntry>(Enumerable.Empty<TEntry>());
}
public ArchiveType Type { get; private set; }
void IArchiveExtractionListener.FireEntryExtractionBegin(IArchiveEntry entry)
{
@@ -134,9 +134,6 @@ namespace SharpCompress.Archive
lazyVolumes.EnsureFullyLoaded();
}
public ArchiveType Type { get; private set; }
void IExtractionListener.FireCompressedBytesRead(long currentPartCompressedBytes, long compressedReadBytes)
{
if (CompressedBytesRead != null)

13
SharpCompress/Archive/AbstractWritableArchive.Extensions.cs
View File

@@ -1,4 +1,5 @@
using System.IO;
using System;
using System.IO;
using SharpCompress.Common;
namespace SharpCompress.Archive
@@ -80,6 +81,16 @@ namespace SharpCompress.Archive
fileInfo.LastWriteTime);
}
}
public static TEntry AddEntry<TEntry, TVolume>(this AbstractWritableArchive<TEntry, TVolume> writableArchive, string key, FileInfo fileInfo)
where TEntry : IArchiveEntry
where TVolume : IVolume
{
if (!fileInfo.Exists)
{
throw new ArgumentException("FileInfo does not exist.");
}
return writableArchive.AddEntry(key, fileInfo.OpenRead(), true, fileInfo.Length, fileInfo.LastWriteTime);
}
#endif
}
}

11
SharpCompress/Archive/AbstractWritableArchive.cs
View File

@@ -105,17 +105,6 @@ namespace SharpCompress.Archive
return false;
}
#if !PORTABLE && !NETFX_CORE
public TEntry AddEntry(string key, FileInfo fileInfo)
{
if (!fileInfo.Exists)
{
throw new ArgumentException("FileInfo does not exist.");
}
return AddEntry(key, fileInfo.OpenRead(), true, fileInfo.Length, fileInfo.LastWriteTime);
}
#endif
public void SaveTo(Stream stream, CompressionInfo compressionType)
{
//reset streams of new entries

2
SharpCompress/Archive/Zip/ZipArchive.cs
View File

@@ -181,7 +181,7 @@ namespace SharpCompress.Archive.Zip
protected override IEnumerable<ZipArchiveEntry> LoadEntries(IEnumerable<ZipVolume> volumes)
{
var volume = volumes.Single();
Stream stream = volumes.Single().Stream;
Stream stream = volume.Stream;
foreach (ZipHeader h in headerFactory.ReadSeekableHeader(stream))
{
if (h != null)

4
SharpCompress/Common/Tar/TarFilePart.cs
View File

@@ -6,12 +6,12 @@ namespace SharpCompress.Common.Tar
{
internal class TarFilePart : FilePart
{
private Stream seekableStream;
private readonly Stream seekableStream;
internal TarFilePart(TarHeader header, Stream seekableStream)
{
this.seekableStream = seekableStream;
this.Header = header;
Header = header;
}
internal TarHeader Header { get; private set; }