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

add extract all test

Browse Source
This commit is contained in:
Adam Hathcock
2025-12-18 15:26:35 +00:00
parent 230f96e8e8
commit 220ba67faa
3 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ public static class ArchiveFactory
)
{
using var archive = Open(sourceArchive);
archive.WriteToDirectory(destinationDirectory, options);
archive.ExtractToDirectory(destinationDirectory, options);
}
private static T FindFactory<T>(FileInfo finfo)

13
src/SharpCompress/Archives/IArchiveExtensions.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using SharpCompress.Common;
using SharpCompress.Readers;
@@ -22,17 +21,10 @@ public static class IArchiveExtensions
using var reader = archive.ExtractAllEntries();
reader.WriteAllToDirectory(destinationDirectory, options);
}
/// <summary>
/// Extracts the archive to the destination directory. Directories will be created as needed.
/// </summary>
/// <param name="archive">The archive to extract.</param>
/// <param name="destination">The folder to extract into.</param>
/// <param name="progressReport">Optional progress report callback.</param>
/// <param name="cancellationToken">Optional cancellation token.</param>
public static void ExtractToDirectory(
this IArchive archive,
string destination,
ExtractionOptions? options = null,
Action<double>? progressReport = null,
CancellationToken cancellationToken = default
)
@@ -74,8 +66,7 @@ public static class IArchiveExtensions
}
// Write file
using var fs = File.OpenWrite(path);
entry.WriteTo(fs);
entry.WriteToFile(path, options);
// Update progress
bytesRead += entry.Size;

48
tests/SharpCompress.Test/ExtractAll.cs Normal file
View File

@@ -0,0 +1,48 @@
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using SharpCompress.Archives;
using SharpCompress.Common;
using SharpCompress.Readers;
using Xunit;
namespace SharpCompress.Test;
public class ExtractAll : TestBase
{
[Theory]
[InlineData("Zip.deflate.zip")]
[InlineData("Rar5.rar")]
[InlineData("Rar.rar")]
[InlineData("Rar.solid.rar")]
[InlineData( "7Zip.solid.7z")]
[InlineData( "7Zip.nonsolid.7z")]
[InlineData( "7Zip.LZMA.7z")]
public async Task ExtractAllEntries(string archivePath)
{
var testArchive = Path.Combine(TEST_ARCHIVES_PATH, archivePath);
var options = new ExtractionOptions() {
ExtractFullPath = true,
Overwrite = true
};
using var archive = ArchiveFactory.Open( testArchive );
if (archive.IsSolid && archive.Type != ArchiveType.SevenZip)
{
var reader = archive.ExtractAllEntries();
while (await reader.MoveToNextEntryAsync())
{
if (!reader.Entry.IsDirectory)
{
await reader.WriteEntryToDirectoryAsync(SCRATCH_FILES_PATH, options);
}
}
}
else
{
archive.ExtractToDirectory(SCRATCH_FILES_PATH, options);
}
}
}