From 70c730155da3413ba172e94a0a1a2540f534130a Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Thu, 15 Jul 2021 07:35:26 -0600 Subject: [PATCH] 2.5.1.3 --- CHANGELOG.md | 4 ++++ Wabbajack.CLI/Wabbajack.CLI.csproj | 4 ++-- Wabbajack.Common/ProcessHelper.cs | 3 ++- Wabbajack.Common/Util/TempFolder.cs | 1 - Wabbajack.ImageHashing/ImageState.cs | 7 ++++--- Wabbajack.Launcher/Wabbajack.Launcher.csproj | 4 ++-- Wabbajack.Server/Wabbajack.Server.csproj | 4 ++-- Wabbajack/Wabbajack.csproj | 4 ++-- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b9d8c0c..1c3f5e92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### Changelog +#### Version - 2.5.1.3 - 7/15/2021 +* Fix textconv issue caused by a bug in ProcessHelper +* Add version info to gallery view (thanks JanuarySnow) + #### Version - 2.5.1.2 - 7/11/2021 * Fix issue with LL file upgrading * Update GameFinder library to latest version diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index a93db515..95604fda 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.5.1.2 - 2.5.1.2 + 2.5.1.3 + 2.5.1.3 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.Common/ProcessHelper.cs b/Wabbajack.Common/ProcessHelper.cs index a333b576..db1974d7 100644 --- a/Wabbajack.Common/ProcessHelper.cs +++ b/Wabbajack.Common/ProcessHelper.cs @@ -80,9 +80,10 @@ namespace Wabbajack.Common }; p.ErrorDataReceived += ErrorEventHandler; - p.Start(); p.BeginErrorReadLine(); p.BeginOutputReadLine(); + p.Start(); + ChildProcessTracker.AddProcess(p); try diff --git a/Wabbajack.Common/Util/TempFolder.cs b/Wabbajack.Common/Util/TempFolder.cs index 2b9d8e08..d3cae4f4 100644 --- a/Wabbajack.Common/Util/TempFolder.cs +++ b/Wabbajack.Common/Util/TempFolder.cs @@ -54,7 +54,6 @@ namespace Wabbajack.Common public async ValueTask DisposeAsync() { - Utils.Log($"Deleting {Dir}"); if (DeleteAfter && Dir.Exists) { await Utils.DeleteDirectory(Dir); diff --git a/Wabbajack.ImageHashing/ImageState.cs b/Wabbajack.ImageHashing/ImageState.cs index 48a3a4ea..4b66a0fd 100644 --- a/Wabbajack.ImageHashing/ImageState.cs +++ b/Wabbajack.ImageHashing/ImageState.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -88,11 +89,11 @@ namespace Wabbajack.ImageHashing ThrowOnNonZeroExitCode = true, LogError = true }; - var lines = new List(); + var lines = new ConcurrentStack(); using var _ = ph.Output.Where(p => p.Type == ProcessHelper.StreamType.Output) .Select(p => p.Line) .Where(p => p.Contains(" = ")) - .Subscribe(l => lines.Add(l)); + .Subscribe(l => lines.Push(l)); try { await ph.Start(); @@ -115,6 +116,6 @@ namespace Wabbajack.ImageHashing Format = Enum.Parse(data["format"]), PerceptualHash = await GetPHash(path) }; - } + } } } diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index cb997b8f..5fff9d53 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.2 - 2.5.1.2 + 2.5.1.3 + 2.5.1.3 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index 447efa00..c1c48371 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe net5.0-windows - 2.5.1.2 - 2.5.1.2 + 2.5.1.3 + 2.5.1.3 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index dd6fd4c7..b0d6a810 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.5.1.2 - 2.5.1.2 + 2.5.1.3 + 2.5.1.3 Copyright © 2019-2020 An automated ModList installer true