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

Added remaining Open method variants

Browse Source
This commit is contained in:
vpenades
2022-06-14 11:39:52 +02:00
parent 8ea8dcde19
commit 20142f91fd
7 changed files with 183 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
src/SharpCompress/Archives/ArchiveFactory.cs
View File

@@ -26,11 +26,11 @@ namespace SharpCompress.Archives
{
archiveFactories = new HashSet<IArchiveFactory>();
RegisterFactory(new Tar.TarArchiveFactory());
RegisterFactory(new Rar.RarArchiveFactory());
RegisterFactory(new Zip.ZipArchiveFactory());
RegisterFactory(new GZip.GZipArchiveFactory());
RegisterFactory(new Rar.RarArchiveFactory());
RegisterFactory(new SevenZip.SevenZipArchiveFactory());
RegisterFactory(new GZip.GZipArchiveFactory());
RegisterFactory(new Tar.TarArchiveFactory());
}
/// <summary>
@@ -61,25 +61,7 @@ namespace SharpCompress.Archives
readerOptions ??= new ReaderOptions();
long startPosition = stream.Position;
foreach(var factory in Factories)
{
stream.Seek(startPosition, SeekOrigin.Begin);
if (factory.IsArchive(stream))
{
stream.Seek(startPosition, SeekOrigin.Begin);
return factory.Open(stream, readerOptions);
}
}
var extensions = Factories
.Select(item => item.Name)
.Aggregate((a,b) => a + ", " + b );
throw new InvalidOperationException($"Cannot determine compressed stream type. Supported Archive Formats: {extensions}");
return FindArchiveFactory(stream).Open(stream, readerOptions);
}
public static IWritableArchive Create(ArchiveType type)
@@ -114,29 +96,7 @@ namespace SharpCompress.Archives
fileInfo.CheckNotNull(nameof(fileInfo));
options ??= new ReaderOptions { LeaveStreamOpen = false };
ArchiveType? type;
using (Stream stream = fileInfo.OpenRead())
{
IsArchive(stream, out type); //test and reset stream position
if (type != null)
{
switch (type.Value)
{
case ArchiveType.Zip:
return ZipArchive.Open(fileInfo, options);
case ArchiveType.SevenZip:
return SevenZipArchive.Open(fileInfo, options);
case ArchiveType.GZip:
return GZipArchive.Open(fileInfo, options);
case ArchiveType.Rar:
return RarArchive.Open(fileInfo, options);
case ArchiveType.Tar:
return TarArchive.Open(fileInfo, options);
}
}
}
throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
return FindArchiveFactory(fileInfo).Open(fileInfo, options);
}
/// <summary>
@@ -154,31 +114,10 @@ namespace SharpCompress.Archives
if (files.Length == 1)
return Open(fileInfo, options);
fileInfo.CheckNotNull(nameof(fileInfo));
options ??= new ReaderOptions { LeaveStreamOpen = false };
ArchiveType? type;
using (Stream stream = fileInfo.OpenRead())
IsArchive(stream, out type); //test and reset stream position
if (type != null)
{
switch (type.Value)
{
case ArchiveType.Zip:
return ZipArchive.Open(files, options);
case ArchiveType.SevenZip:
return SevenZipArchive.Open(files, options);
case ArchiveType.GZip:
return GZipArchive.Open(files, options);
case ArchiveType.Rar:
return RarArchive.Open(files, options);
case ArchiveType.Tar:
return TarArchive.Open(files, options);
}
}
throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
return FindArchiveFactory(fileInfo).Open(fileInfos, options);
}
/// <summary>
@@ -189,36 +128,18 @@ namespace SharpCompress.Archives
public static IArchive Open(IEnumerable<Stream> streams, ReaderOptions? options = null)
{
streams.CheckNotNull(nameof(streams));
if (streams.Count() == 0)
Stream[] streamsArray = streams.ToArray();
if (streamsArray.Length == 0)
throw new InvalidOperationException("No streams");
if (streams.Count() == 1)
return Open(streams.First(), options);
Stream firstStream = streamsArray[0];
if (streamsArray.Length == 1)
return Open(firstStream, options);
firstStream.CheckNotNull(nameof(firstStream));
options ??= new ReaderOptions();
ArchiveType? type;
using (Stream stream = streams.First())
IsArchive(stream, out type); //test and reset stream position
if (type != null)
{
switch (type.Value)
{
case ArchiveType.Zip:
return ZipArchive.Open(streams, options);
case ArchiveType.SevenZip:
return SevenZipArchive.Open(streams, options);
case ArchiveType.GZip:
return GZipArchive.Open(streams, options);
case ArchiveType.Rar:
return RarArchive.Open(streams, options);
case ArchiveType.Tar:
return TarArchive.Open(streams, options);
}
}
throw new InvalidOperationException("Cannot determine compressed stream type. Supported Archive Formats: Zip, GZip, Tar, Rar, 7Zip");
}
return FindArchiveFactory(firstStream).Open(streamsArray, options);
}
/// <summary>
/// Extract to specific directory, retaining filename
@@ -233,6 +154,44 @@ namespace SharpCompress.Archives
}
}
private static IArchiveFactory FindArchiveFactory(FileInfo finfo)
{
finfo.CheckNotNull(nameof(finfo));
using (Stream stream = finfo.OpenRead())
{
return FindArchiveFactory(stream);
}
}
private static IArchiveFactory FindArchiveFactory(Stream stream)
{
stream.CheckNotNull(nameof(stream));
if (!stream.CanRead || !stream.CanSeek)
{
throw new ArgumentException("Stream should be readable and seekable");
}
long startPosition = stream.Position;
foreach (var factory in Factories)
{
stream.Seek(startPosition, SeekOrigin.Begin);
if (factory.IsArchive(stream))
{
stream.Seek(startPosition, SeekOrigin.Begin);
return factory;
}
}
var extensions = Factories
.Select(item => item.Name)
.Aggregate((a, b) => a + ", " + b);
throw new InvalidOperationException($"Cannot determine compressed stream type. Supported Archive Formats: {extensions}");
}
public static bool IsArchive(string filePath, out ArchiveType? type)
{
filePath.CheckNotNullOrEmpty(nameof(filePath));

20
src/SharpCompress/Archives/GZip/GZipArchiveFactory.cs
View File

@@ -19,7 +19,7 @@ namespace SharpCompress.Archives.GZip
}
/// <inheritdoc/>
public bool IsArchive(Stream stream)
public bool IsArchive(Stream stream, string? password = null)
{
return GZipArchive.IsGZipFile(stream);
}
@@ -29,5 +29,23 @@ namespace SharpCompress.Archives.GZip
{
return GZipArchive.Open(stream, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
return GZipArchive.Open(fileInfo, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
return GZipArchive.Open(streams, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? readerOptions = null)
{
return GZipArchive.Open(fileInfos, readerOptions);
}
}
}

28
src/SharpCompress/Archives/IArchiveFactory.cs
View File

@@ -36,14 +36,36 @@ namespace SharpCompress.Archives
/// <summary>
/// Returns true if the stream represents an archive of the format defined by this type.
/// </summary>
/// <param name="stream"></param>
bool IsArchive(Stream stream);
/// <param name="stream"></param>
/// /// <param name="password">optional password</param>
bool IsArchive(Stream stream, string? password = null);
/// <summary>
/// Opens an Archive for random access.
/// </summary>
/// <param name="stream">An open, readable and seekable stream.</param>
/// <param name="readerOptions">reading options.</param>
/// <param name="readerOptions">reading options.</param>
IArchive Open(Stream stream, ReaderOptions? readerOptions = null);
/// <summary>
/// Constructor with a FileInfo object to an existing file.
/// </summary>
/// <param name="fileInfo">the file to open.</param>
/// <param name="readerOptions">reading options.</param>
IArchive Open(System.IO.FileInfo fileInfo, ReaderOptions? readerOptions = null);
/// <summary>
/// Constructor with IEnumerable FileInfo objects, multi and split support.
/// </summary>
/// <param name="streams"></param>
/// <param name="readerOptions">reading options.</param>
IArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null);
/// <summary>
/// Constructor with IEnumerable Stream objects, multi and split support.
/// </summary>
/// <param name="fileInfos"></param>
/// <param name="readerOptions">reading options.</param>
IArchive Open(IEnumerable<System.IO.FileInfo> fileInfos, ReaderOptions? readerOptions = null);
}
}

20
src/SharpCompress/Archives/Rar/RarArchiveFactory.cs
View File

@@ -20,7 +20,7 @@ namespace SharpCompress.Archives.Rar
}
/// <inheritdoc/>
public bool IsArchive(Stream stream)
public bool IsArchive(Stream stream, string? password = null)
{
return RarArchive.IsRarFile(stream);
}
@@ -30,5 +30,23 @@ namespace SharpCompress.Archives.Rar
{
return RarArchive.Open(stream, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
return RarArchive.Open(fileInfo, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
return RarArchive.Open(streams, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? readerOptions = null)
{
return RarArchive.Open(fileInfos, readerOptions);
}
}
}

20
src/SharpCompress/Archives/SevenZip/SevenZipArchiveFactory.cs
View File

@@ -19,7 +19,7 @@ namespace SharpCompress.Archives.SevenZip
}
/// <inheritdoc/>
public bool IsArchive(Stream stream)
public bool IsArchive(Stream stream, string? password = null)
{
return SevenZipArchive.IsSevenZipFile(stream);
}
@@ -29,5 +29,23 @@ namespace SharpCompress.Archives.SevenZip
{
return SevenZipArchive.Open(stream, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
return SevenZipArchive.Open(fileInfo, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
return SevenZipArchive.Open(streams, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? readerOptions = null)
{
return SevenZipArchive.Open(fileInfos, readerOptions);
}
}
}

21
src/SharpCompress/Archives/Tar/TarArchiveFactory.cs
View File

@@ -19,7 +19,7 @@ namespace SharpCompress.Archives.Tar
}
/// <inheritdoc/>
public bool IsArchive(Stream stream)
public bool IsArchive(Stream stream, string? password = null)
{
return TarArchive.IsTarFile(stream);
}
@@ -29,5 +29,24 @@ namespace SharpCompress.Archives.Tar
{
return TarArchive.Open(stream, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
return TarArchive.Open(fileInfo, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
return TarArchive.Open(streams, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? readerOptions = null)
{
return TarArchive.Open(fileInfos, readerOptions);
}
}
}

31
src/SharpCompress/Archives/Zip/ZipArchiveFactory.cs
View File

@@ -21,9 +21,18 @@ namespace SharpCompress.Archives.Zip
}
/// <inheritdoc/>
public bool IsArchive(Stream stream)
public bool IsArchive(Stream stream, string? password = null)
{
return ZipArchive.IsZipFile(stream);
long startPosition = stream.Position;
if (ZipArchive.IsZipFile(stream, password)) return true;
stream.Seek(startPosition, SeekOrigin.Begin);
//test the zip (last) file of a multipart zip
if (ZipArchive.IsZipMulti(stream)) return true;
return false;
}
/// <inheritdoc/>
@@ -31,5 +40,23 @@ namespace SharpCompress.Archives.Zip
{
return ZipArchive.Open(stream, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(FileInfo fileInfo, ReaderOptions? readerOptions = null)
{
return ZipArchive.Open(fileInfo, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<Stream> streams, ReaderOptions? readerOptions = null)
{
return ZipArchive.Open(streams, readerOptions);
}
/// <inheritdoc/>
public IArchive Open(IEnumerable<FileInfo> fileInfos, ReaderOptions? readerOptions = null)
{
return ZipArchive.Open(fileInfos, readerOptions);
}
}
}