Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lock down 7zip a bit until it learns to behave

Browse Source
This commit is contained in:
Timothy Baldridge 2019-08-24 20:26:24 -06:00
parent dc6b4b9ef7
commit 40950b442c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Wabbajack.Common/FileExtractor.cs
View File

@ -12,6 +12,11 @@ namespace Wabbajack.Common
{
public class FileExtractor
{
static FileExtractor()
{
_7ZipLock = new object ();
}
public class Entry
{
public string Name;
@ -59,8 +64,11 @@ namespace Wabbajack.Common
}
}
private static void ExtractVia7Zip(string file, Func<Entry, Stream> f, bool leave_open)
{
// 7Zip uses way too much memory so for now, let's limit it a bit
lock(_7ZipLock)
using (var af = new ArchiveFile(file))
{
af.Extract(entry =>
@ -76,6 +84,8 @@ namespace Wabbajack.Common
}
private const int ZIP_BUFFER_SIZE = 1024 * 8;
private static object _7ZipLock;
private static void ExtractViaNetZip(string file, Func<Entry, Stream> f, bool leave_open)
{
using (var s = new ZipFile(File.OpenRead(file)))