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 #223 from erri120/inno

Browse Source 
Extract .exe with innounp
This commit is contained in:
Timothy Baldridge 2019-12-01 07:52:47 -07:00 committed by GitHub
commit 430fdb45d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 108 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack.Common/Consts.cs
View File

@ -17,7 +17,7 @@ namespace Wabbajack.Common
public static string MegaPrefix = "https://mega.nz/#!";
public static HashSet<string> SupportedArchives = new HashSet<string> {".zip", ".rar", ".7z", ".7zip", ".fomod", ".omod"};
public static HashSet<string> SupportedArchives = new HashSet<string> {".zip", ".rar", ".7z", ".7zip", ".fomod", ".omod", ".exe"};
public static HashSet<string> SupportedBSAs = new HashSet<string> {".bsa", ".ba2", ".BA2"};

114
Wabbajack.Common/FileExtractor.cs
View File

@ -1,10 +1,14 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Reflection;
using System.Security.Cryptography;
using Alphaleonis.Win32.Filesystem;
using Compression.BSA;
using ICSharpCode.SharpZipLib.GZip;
using Newtonsoft.Json;
using OMODFramework;
namespace Wabbajack.Common
@ -15,7 +19,7 @@ namespace Wabbajack.Common
{
ExtractResource("Wabbajack.Common.7z.dll.gz", "7z.dll");
ExtractResource("Wabbajack.Common.7z.exe.gz", "7z.exe");
//ExtractResource("Wabbajack.Common.innounp.exe.gz", "innounp.exe");
ExtractResource("Wabbajack.Common.innounp.exe.gz", "innounp.exe");
}
private static void ExtractResource(string from, string to)
@ -39,6 +43,8 @@ namespace Wabbajack.Common
ExtractAllWithBSA(queue, source, dest);
else if (source.EndsWith(".omod"))
ExtractAllWithOMOD(source, dest);
else if (source.EndsWith(".exe"))
ExtractAllWithInno(source, dest);
else
ExtractAllWith7Zip(source, dest);
}
@ -49,6 +55,64 @@ namespace Wabbajack.Common
}
}
private static void ExtractAllWithInno(string source, string dest)
{
Utils.Log($"Extracting {Path.GetFileName(source)}");
var info = new ProcessStartInfo
{
FileName = "innounp.exe",
Arguments = $"-x -y -b -d\"{dest}\" \"{source}\"",
RedirectStandardError = true,
RedirectStandardInput = true,
RedirectStandardOutput = true,
UseShellExecute = false,
CreateNoWindow = true
};
var p = new Process {StartInfo = info};
p.Start();
ChildProcessTracker.AddProcess(p);
try
{
p.PriorityClass = ProcessPriorityClass.BelowNormal;
}
catch (Exception e)
{
Utils.LogToFile($"Error while setting process priority level for innounp.exe\n{e}");
}
var name = Path.GetFileName(source);
try
{
while (!p.HasExited)
{
var line = p.StandardOutput.ReadLine();
if (line == null)
break;
if (line.Length <= 4 || line[3] != '%')
continue;
int.TryParse(line.Substring(0, 3), out var percent);
Utils.Status($"Extracting {name} - {line.Trim()}", percent);
}
}
catch (Exception e)
{
Utils.LogToFile($"Error while reading StandardOutput for innounp.exe\n{e}");
}
p.WaitForExit();
if (p.ExitCode == 0)
return;
Utils.Log(p.StandardOutput.ReadToEnd());
Utils.Log($"Extraction error extracting {source}");
}
private static string ExtractAllWithOMOD(string source, string dest)
{
Utils.Log($"Extracting {Path.GetFileName(source)}");
@ -108,10 +172,7 @@ namespace Wabbajack.Common
CreateNoWindow = true
};
var p = new Process
{
StartInfo = info
};
var p = new Process {StartInfo = info};
p.Start();
ChildProcessTracker.AddProcess(p);
@ -131,9 +192,9 @@ namespace Wabbajack.Common
var line = p.StandardOutput.ReadLine();
if (line == null)
break;
if (line.Length <= 4 || line[3] != '%') continue;
int.TryParse(line.Substring(0, 3), out var percent);
Utils.Status($"Extracting {name} - {line.Trim()}", percent);
}
@ -157,8 +218,41 @@ namespace Wabbajack.Common
/// <returns></returns>
public static bool CanExtract(string v)
{
v = v.ToLower();
return Consts.SupportedArchives.Contains(v) || Consts.SupportedBSAs.Contains(v);
var ext = Path.GetExtension(v.ToLower());
if(ext != ".exe")
return Consts.SupportedArchives.Contains(ext) || Consts.SupportedBSAs.Contains(ext);
var info = new ProcessStartInfo
{
FileName = "innounp.exe",
Arguments = $"-t \"{v}\" ",
RedirectStandardError = true,
RedirectStandardInput = true,
RedirectStandardOutput = true,
UseShellExecute = false,
CreateNoWindow = true
};
var p = new Process {StartInfo = info};
p.Start();
ChildProcessTracker.AddProcess(p);
var name = Path.GetFileName(v);
while (!p.HasExited)
{
var line = p.StandardOutput.ReadLine();
if (line == null)
break;
if (line[0] != '#')
continue;
Utils.Status($"Testing {name} - {line.Trim()}");
}
p.WaitForExit();
return p.ExitCode == 0;
}
}
}
}

2
Wabbajack.Common/Wabbajack.Common.csproj
View File

@ -114,6 +114,7 @@
<EmbeddedResource Include="7z.dll.gz" />
<EmbeddedResource Include="7z.exe.gz" />
<None Include="app.config" />
<EmbeddedResource Include="innounp.exe.gz" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\Compression.BSA\Compression.BSA.csproj">
@ -128,6 +129,7 @@
<ItemGroup>
<Content Include="7z.dll" />
<Content Include="7z.exe" />
<Content Include="innounp.exe" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AlphaFS">

BIN
Wabbajack.Common/innounp.exe Normal file
View File

Binary file not shown.

BIN
Wabbajack.Common/innounp.exe.gz Normal file
View File

Binary file not shown.

2
Wabbajack.VirtualFileSystem/VirtualFile.cs
View File

@ -143,7 +143,7 @@ namespace Wabbajack.VirtualFileSystem
Hash = abs_path.FileHash()
};
if (FileExtractor.CanExtract(Path.GetExtension(abs_path)))
if (FileExtractor.CanExtract(abs_path))
{
using (var tempFolder = context.GetTemporaryFolder())