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

2.5.1.2

Browse Source
This commit is contained in:
Timothy Baldridge 2021-07-11 16:23:44 -06:00
parent 13a567e705
commit ba3c3a43f1
6 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
### Changelog ### Changelog
#### Version - 2.5.1.2 - 7/11/2021
* Fix issue with LL file upgrading
* Update GameFinder library to latest version
* Switch texture recompression to use TextConv for better compatability
#### Version - 2.5.1.1 - 7/9/2021 #### Version - 2.5.1.1 - 7/9/2021
* Fix a bug with INI path remapping, was using case sensitive replace * Fix a bug with INI path remapping, was using case sensitive replace

4
Wabbajack.CLI/Wabbajack.CLI.csproj
View File

@ -6,8 +6,8 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.5.1.1</AssemblyVersion> <AssemblyVersion>2.5.1.2</AssemblyVersion>
<FileVersion>2.5.1.1</FileVersion> <FileVersion>2.5.1.2</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

61
Wabbajack.ImageHashing/ImageState.cs
View File

@ -79,33 +79,42 @@ namespace Wabbajack.ImageHashing
await ConvertImage(inFile, to.Parent, state.Width, state.Height, state.Format, ext); await ConvertImage(inFile, to.Parent, state.Width, state.Height, state.Format, ext);
} }
public static async Task<ImageState> GetState(AbsolutePath path) public static async Task<ImageState?> GetState(AbsolutePath path)
{ {
var ph = new ProcessHelper var ph = new ProcessHelper
{ {
Path = @"Tools\texdiag.exe".RelativeTo(AbsolutePath.EntryPoint), Arguments = new object[] {"info", path, "-nologo"}, Path = @"Tools\texdiag.exe".RelativeTo(AbsolutePath.EntryPoint),
ThrowOnNonZeroExitCode = true, Arguments = new object[] {"info", path, "-nologo"},
LogError = true ThrowOnNonZeroExitCode = true,
}; LogError = true
var lines = new List<string>(); };
using var _ = ph.Output.Where(p => p.Type == ProcessHelper.StreamType.Output) var lines = new List<string>();
.Select(p => p.Line) using var _ = ph.Output.Where(p => p.Type == ProcessHelper.StreamType.Output)
.Where(p => p.Contains(" = ")) .Select(p => p.Line)
.Subscribe(l => lines.Add(l)); .Where(p => p.Contains(" = "))
await ph.Start(); .Subscribe(l => lines.Add(l));
var data = lines.Select(l => try
{ {
var split = l.Split(" = "); await ph.Start();
return (split[0].Trim(), split[1].Trim()); }
}).ToDictionary(p => p.Item1, p => p.Item2); catch (Exception ex)
{
return new ImageState return null;
{ }
Width = int.Parse(data["width"]),
Height = int.Parse(data["height"]), var data = lines.Select(l =>
Format = Enum.Parse<DXGI_FORMAT>(data["format"]), {
PerceptualHash = await GetPHash(path) var split = l.Split(" = ");
}; return (split[0].Trim(), split[1].Trim());
} }).ToDictionary(p => p.Item1, p => p.Item2);
return new ImageState
{
Width = int.Parse(data["width"]),
Height = int.Parse(data["height"]),
Format = Enum.Parse<DXGI_FORMAT>(data["format"]),
PerceptualHash = await GetPHash(path)
};
}
} }
} }

4
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -4,8 +4,8 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.5.1.1</AssemblyVersion> <AssemblyVersion>2.5.1.2</AssemblyVersion>
<FileVersion>2.5.1.1</FileVersion> <FileVersion>2.5.1.2</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

4
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net5.0-windows</TargetFramework>
<AssemblyVersion>2.5.1.1</AssemblyVersion> <AssemblyVersion>2.5.1.2</AssemblyVersion>
<FileVersion>2.5.1.1</FileVersion> <FileVersion>2.5.1.2</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description> <Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>

4
Wabbajack/Wabbajack.csproj
View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.5.1.1</AssemblyVersion> <AssemblyVersion>2.5.1.2</AssemblyVersion>
<FileVersion>2.5.1.1</FileVersion> <FileVersion>2.5.1.2</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>