SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-07-20 15:55:15 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Normalize extraction

Browse Source
This commit is contained in:
Matt Nadareski
2024-11-04 10:20:46 -05:00
parent 56c1fd31d4
commit 4ba3c3e3ad
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BinaryObjectScanner/FileType/BZip2.cs
View File

@@ -36,7 +36,7 @@ namespace BinaryObjectScanner.FileType
string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
Directory.CreateDirectory(tempPath);
using (BZip2Stream bz2File = new BZip2Stream(stream, CompressionMode.Decompress, true))
using (var bz2File = new BZip2Stream(stream, CompressionMode.Decompress, true))
{
string tempFile = Path.Combine(tempPath, Guid.NewGuid().ToString());
using (FileStream fs = File.OpenWrite(tempFile))

33
Test/Extractor.cs
View File

@@ -140,7 +140,14 @@ namespace Test
if (entry.Key == null)
continue;
// If we have a partial entry due to an incomplete multi-part archive, skip it
if (!entry.IsComplete)
continue;
string tempFile = Path.Combine(outputDirectory, entry.Key);
var directoryName = Path.GetDirectoryName(tempFile);
if (directoryName != null && !Directory.Exists(directoryName))
Directory.CreateDirectory(directoryName);
entry.WriteToFile(tempFile);
}
catch (Exception ex)
@@ -229,7 +236,9 @@ namespace Test
// If an individual entry fails
try
{
Directory.CreateDirectory(outputDirectory);
string tempFile = Path.Combine(outputDirectory, Guid.NewGuid().ToString());
using FileStream fs = File.OpenWrite(tempFile);
bz2File.CopyTo(fs);
}
@@ -679,6 +688,10 @@ namespace Test
if (entry.Key == null)
continue;
// If the entry is partial due to an incomplete multi-part archive, skip it
if (!entry.IsComplete)
continue;
string tempFile = Path.Combine(outputDirectory, entry.Key);
string? directoryName = Path.GetDirectoryName(tempFile);
if (directoryName != null)
@@ -755,7 +768,14 @@ namespace Test
if (entry.Key == null)
continue;
// If we have a partial entry due to an incomplete multi-part archive, skip it
if (!entry.IsComplete)
continue;
string tempFile = Path.Combine(outputDirectory, entry.Key);
var directoryName = Path.GetDirectoryName(tempFile);
if (directoryName != null && !Directory.Exists(directoryName))
Directory.CreateDirectory(directoryName);
entry.WriteToFile(tempFile);
}
catch (Exception ex)
@@ -801,7 +821,7 @@ namespace Test
}
// Tape Archive
else if (ft == WrapperType.RAR)
else if (ft == WrapperType.TapeArchive)
{
// Build the archive information
Console.WriteLine("Extracting Tape Archive contents");
@@ -828,7 +848,14 @@ namespace Test
if (entry.Key == null)
continue;
// If we have a partial entry due to an incomplete multi-part archive, skip it
if (!entry.IsComplete)
continue;
string tempFile = Path.Combine(outputDirectory, entry.Key);
var directoryName = Path.GetDirectoryName(tempFile);
if (directoryName != null && !Directory.Exists(directoryName))
Directory.CreateDirectory(directoryName);
entry.WriteToFile(tempFile);
}
catch (Exception ex)
@@ -928,7 +955,7 @@ namespace Test
}
// xz
else if (ft == WrapperType.RAR)
else if (ft == WrapperType.XZ)
{
// Build the xz information
Console.WriteLine("Extracting xz contents");
@@ -942,7 +969,9 @@ namespace Test
// If an individual entry fails
try
{
Directory.CreateDirectory(outputDirectory);
string tempFile = Path.Combine(outputDirectory, Guid.NewGuid().ToString());
using FileStream fs = File.OpenWrite(tempFile);
xzFile.CopyTo(fs);
}