diff --git a/CHANGELOG.md b/CHANGELOG.md index ebce7414..2b9d8c0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ### 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 * Fix a bug with INI path remapping, was using case sensitive replace diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index 8aa1d9e0..a93db515 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.5.1.1 - 2.5.1.1 + 2.5.1.2 + 2.5.1.2 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.ImageHashing/ImageState.cs b/Wabbajack.ImageHashing/ImageState.cs index f935614b..48a3a4ea 100644 --- a/Wabbajack.ImageHashing/ImageState.cs +++ b/Wabbajack.ImageHashing/ImageState.cs @@ -79,33 +79,42 @@ namespace Wabbajack.ImageHashing await ConvertImage(inFile, to.Parent, state.Width, state.Height, state.Format, ext); } - public static async Task GetState(AbsolutePath path) + public static async Task GetState(AbsolutePath path) { var ph = new ProcessHelper - { - Path = @"Tools\texdiag.exe".RelativeTo(AbsolutePath.EntryPoint), Arguments = new object[] {"info", path, "-nologo"}, - ThrowOnNonZeroExitCode = true, - LogError = true - }; - var lines = new List(); - using var _ = ph.Output.Where(p => p.Type == ProcessHelper.StreamType.Output) - .Select(p => p.Line) - .Where(p => p.Contains(" = ")) - .Subscribe(l => lines.Add(l)); - await ph.Start(); - var data = lines.Select(l => - { - 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(data["format"]), - PerceptualHash = await GetPHash(path) - }; - } + { + Path = @"Tools\texdiag.exe".RelativeTo(AbsolutePath.EntryPoint), + Arguments = new object[] {"info", path, "-nologo"}, + ThrowOnNonZeroExitCode = true, + LogError = true + }; + var lines = new List(); + using var _ = ph.Output.Where(p => p.Type == ProcessHelper.StreamType.Output) + .Select(p => p.Line) + .Where(p => p.Contains(" = ")) + .Subscribe(l => lines.Add(l)); + try + { + await ph.Start(); + } + catch (Exception ex) + { + return null; + } + + var data = lines.Select(l => + { + 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(data["format"]), + PerceptualHash = await GetPHash(path) + }; + } } } diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index ed6e24b4..cb997b8f 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ Exe net5.0-windows true - 2.5.1.1 - 2.5.1.1 + 2.5.1.2 + 2.5.1.2 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index 74bdf857..447efa00 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe net5.0-windows - 2.5.1.1 - 2.5.1.1 + 2.5.1.2 + 2.5.1.2 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index 889ce90a..dd6fd4c7 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.5.1.1 - 2.5.1.1 + 2.5.1.2 + 2.5.1.2 Copyright © 2019-2020 An automated ModList installer true