Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/SharpCompress/Archives/SevenZip/SevenZipArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,10 @@ protected override IReader CreateReaderForSolidExtraction() =>
new SevenZipReader(ReaderOptions, this);

public override bool IsSolid =>
Entries.Where(x => !x.IsDirectory).GroupBy(x => x.FilePart.Folder).Count() > 1;
Entries
.Where(x => !x.IsDirectory)
.GroupBy(x => x.FilePart.Folder)
.Any(folder => folder.Count() > 1);

public override long TotalSize =>
_database?._packSizes.Aggregate(0L, (total, packSize) => total + packSize) ?? 0;
Expand Down
19 changes: 19 additions & 0 deletions tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,23 @@ public void SevenZipArchive_Tar_PathRead()
Path.Combine(TEST_ARCHIVES_PATH, "7Zip.Tar.tar")
);
}

[Fact]
public void SevenZipArchive_TestSolidDetection()
{
using var oneBlockSolidArchive = SevenZipArchive.Open(
Path.Combine(TEST_ARCHIVES_PATH, "7Zip.solid.1block.7z")
);
Assert.True(oneBlockSolidArchive.IsSolid);

using var solidArchive = SevenZipArchive.Open(
Path.Combine(TEST_ARCHIVES_PATH, "7Zip.solid.7z")
);
Assert.True(solidArchive.IsSolid);

using var nonSolidArchive = SevenZipArchive.Open(
Path.Combine(TEST_ARCHIVES_PATH, "7Zip.nonsolid.7z")
);
Assert.False(nonSolidArchive.IsSolid);
}
}
Binary file added tests/TestArchives/Archives/7Zip.solid.1block.7z
Binary file not shown.