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

fix some tests

Browse Source
This commit is contained in:
Adam Hathcock
2026-01-28 11:37:24 +00:00
parent 8d5d686b79
commit 6ddcbf2bc9
3 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
View File

@@ -36,32 +36,45 @@ public partial class SevenZipArchive : AbstractArchive<SevenZipArchiveEntry, Sev
IEnumerable<SevenZipVolume> volumes
)
{
var stream = volumes.Single().Stream;
LoadFactory(stream);
if (_database is null)
foreach (var volume in volumes)
{
return Enumerable.Empty<SevenZipArchiveEntry>();
}
var entries = new SevenZipArchiveEntry[_database._files.Count];
for (var i = 0; i < _database._files.Count; i++)
{
var file = _database._files[i];
entries[i] = new SevenZipArchiveEntry(
this,
new SevenZipFilePart(stream, _database, i, file, ReaderOptions.ArchiveEncoding)
);
}
foreach (var group in entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder))
{
var isSolid = false;
foreach (var entry in group)
LoadFactory(volume.Stream);
if (_database is null)
{
entry.IsSolid = isSolid;
isSolid = true; //mark others in this group as solid - same as rar behaviour.
yield break;
}
var entries = new SevenZipArchiveEntry[_database._files.Count];
for (var i = 0; i < _database._files.Count; i++)
{
var file = _database._files[i];
entries[i] = new SevenZipArchiveEntry(
this,
new SevenZipFilePart(
volume.Stream,
_database,
i,
file,
ReaderOptions.ArchiveEncoding
)
);
}
foreach (
var group in entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder)
)
{
var isSolid = false;
foreach (var entry in group)
{
entry.IsSolid = isSolid;
isSolid = true;
}
}
foreach (var entry in entries)
{
yield return entry;
}
}
return entries;
}
private void LoadFactory(Stream stream)

4
tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs
View File

@@ -260,7 +260,7 @@ public class SevenZipArchiveTests : ArchiveTests
// This test verifies that solid archives iterate entries as contiguous streams
// rather than recreating the decompression stream for each entry
var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.solid.7z");
using var archive = SevenZipArchive.Open(testArchive);
using var archive = SevenZipArchive.OpenArchive(testArchive);
Assert.True(archive.IsSolid);
using var reader = archive.ExtractAllEntries();
@@ -284,7 +284,7 @@ public class SevenZipArchiveTests : ArchiveTests
// This test verifies that the folder stream is reused within each folder
// and not recreated for each entry in solid archives
var testArchive = Path.Combine(TEST_ARCHIVES_PATH, "7Zip.solid.7z");
using var archive = SevenZipArchive.Open(testArchive);
using var archive = SevenZipArchive.OpenArchive(testArchive);
Assert.True(archive.IsSolid);
using var reader = archive.ExtractAllEntries();

5
tests/SharpCompress.Test/Zip/ZipShortReadTests.cs
View File

@@ -97,7 +97,10 @@ public class ZipShortReadTests : ReaderTests
private List<string> ReadEntriesFromStream(Stream stream)
{
var names = new List<string>();
using var reader = ReaderFactory.Open(stream, new ReaderOptions { LeaveStreamOpen = true });
using var reader = ReaderFactory.OpenReader(
stream,
new ReaderOptions { LeaveStreamOpen = true }
);
while (reader.MoveToNextEntry())
{