Skip to content

Temporary fix for solid archive detection until SharpCompress makes another release. #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mnadareski merged 1 commit into from
Sep 27, 2025
Merged

Temporary fix for solid archive detection until SharpCompress makes another release. #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 39 additions & 1 deletion SabreTools.Serialization/Wrappers/RAR.Extraction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,46 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
else if (rarFile.Entries.Count == 0)
rarFile = RarArchive.Open(parts, readerOptions);
}

// Explained in https://github.com/adamhathcock/sharpcompress/pull/661. in order to determine whether
// a RAR or 7Z archive is solid or not, you must check the second file in the archive, as the first
// file is always marked non-solid even for solid archives. This iteration is necessary since things
// like directories aren't marked solid either.
// This is only temporary, as solid detection has been fixed in upstream SolidCompress, but they likely
// won't make a new release for a while, and this is too big an issue to leave unfixed.
bool firstFile = true;
bool isSolid = false;
foreach (var entry in rarFile.Entries)
{
try
{
// If the entry is a directory
if (entry.IsDirectory)
continue;

// If the entry has an invalid key
if (entry.Key == null)
continue;

// If we have a partial entry due to an incomplete multi-part archive, skip it
if (!entry.IsComplete)
continue;

if (firstFile)
firstFile = false;
else
{
isSolid = entry.IsSolid;
break;
}
}
catch (Exception ex)
{
if (includeDebug) Console.WriteLine(ex);
}
}

if (rarFile.IsSolid)
if (isSolid)
return ExtractSolid(rarFile, outputDirectory, includeDebug);
else
return ExtractNonSolid(rarFile, outputDirectory, includeDebug);
Expand Down
42 changes: 39 additions & 3 deletions SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,45 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
sevenZip = SevenZipArchive.Open(parts, readerOptions);
}

// Currently doesn't flag solid 7z archives with only 1 solid block as solid, but practically speaking
// this is not much of a concern.
if (sevenZip.IsSolid)
// Explained in https://github.com/adamhathcock/sharpcompress/pull/661. in order to determine whether
// a RAR or 7Z archive is solid or not, you must check the second file in the archive, as the first
// file is always marked non-solid even for solid archives. This iteration is necessary since things
// like directories aren't marked solid either.
// This is only temporary, as solid detection has been fixed in upstream SolidCompress, but they likely
// won't make a new release for a while, and this is too big an issue to leave unfixed.
bool firstFile = true;
bool isSolid = false;
foreach (var entry in sevenZip.Entries)
{
try
{
// If the entry is a directory
if (entry.IsDirectory)
continue;

// If the entry has an invalid key
if (entry.Key == null)
continue;

// If we have a partial entry due to an incomplete multi-part archive, skip it
if (!entry.IsComplete)
continue;

if (firstFile)
firstFile = false;
else
{
isSolid = entry.IsSolid;
break;
}
}
catch (Exception ex)
{
if (includeDebug) Console.WriteLine(ex);
}
}

if (isSolid)
return ExtractSolid(sevenZip, outputDirectory, includeDebug);
else
return ExtractNonSolid(sevenZip, outputDirectory, includeDebug);
Expand Down