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

Merge pull request #1159 from wabbajack-tools/7zip-diagnostic-errors

Browse Source 
7zip diagnostic errors
This commit is contained in:
Timothy Baldridge 2020-11-02 05:18:12 -07:00 committed by GitHub
commit 09c974e04f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Wabbajack.VirtualFileSystem/Context.cs
View File

@ -8,7 +8,9 @@ using System.Reactive.Subjects;
using System.Text;
using System.Threading.Tasks;
using Alphaleonis.Win32.Filesystem;
using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
using Wabbajack.Common;
using Wabbajack.Common.StatusFeed.Errors;
using Wabbajack.VirtualFileSystem.ExtractedFiles;
using Directory = Alphaleonis.Win32.Filesystem.Directory;
using File = System.IO.File;
@ -224,15 +226,28 @@ namespace Wabbajack.VirtualFileSystem
if (filesByParent.TryGetValue(file, out var children))
{
var fileNames = children.ToDictionary(c => c.RelativeName);
await FileExtractor2.GatheringExtract(queue, sfn,
r => fileNames.ContainsKey(r),
async (rel, csf) =>
try
{
await FileExtractor2.GatheringExtract(queue, sfn,
r => fileNames.ContainsKey(r),
async (rel, csf) =>
{
await HandleFile(fileNames[rel], csf);
return 0;
},
tempFolder: tempFolder,
onlyFiles: fileNames.Keys.ToHashSet());
}
catch (_7zipReturnError ex)
{
await using var stream = await sfn.GetStream();
var hash = await stream.xxHashAsync();
if (hash != file.Hash)
{
await HandleFile(fileNames[rel], csf);
return 0;
},
tempFolder: tempFolder,
onlyFiles: fileNames.Keys.ToHashSet());
throw new Exception($"File {file.FullPath} is corrupt, please delete it and retry the installation");
}
throw;
}
}
}