From 1949606fc1e01ddf784d403ac8975a79019b56a2 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Thu, 31 Dec 2020 06:12:21 -0700 Subject: [PATCH 1/2] Add missing line to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35093a3b..f0fca3b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * If a site *does* timeout, throw a log of the CEF state into `CEFStates` for easier debugging by the WJ team * Wrote a new CLI utility to stress test the Verification routines. * Ignore files that have `\Edit Scripts\Export\` in their path +* Added info/support for GoG's version of Kingdom Come : Deliverance #### Version - 2.3.6.0 - 12/29/2020 * Move the LoversLab downloader to a CEF based backed making it interact with CloudFlare a bit better From a7f5e94ab3a162f55ba5749638f53ec9b435e661 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Thu, 31 Dec 2020 10:51:24 -0700 Subject: [PATCH 2/2] Add missing line to changelog --- CHANGELOG.md | 3 +++ Wabbajack.CLI/Wabbajack.CLI.csproj | 4 ++-- Wabbajack.Launcher/Wabbajack.Launcher.csproj | 4 ++-- Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs | 1 + Wabbajack.Lib/Downloaders/LoversLabDownloader.cs | 5 ++++- Wabbajack.Server/Wabbajack.Server.csproj | 4 ++-- Wabbajack.Test/DownloaderTests.cs | 12 ++++++++++++ Wabbajack/Wabbajack.csproj | 4 ++-- 8 files changed, 28 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0fca3b1..a82faf13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ### Changelog +#### Version - 2.3.6.2 - 12/31/2020 +* HOTFIX: Also apply the IPS4 changes to LL Meta lookups + #### Version - 2.3.6.1 - 12/31/2020 * When IPS4 (e.g. LL) sites based on CEF fail to validate, they no longer hang the app * If a IPS4 CEF site throws a 503, or 400 error, retry diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index 921a97de..5b5b8abe 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.3.6.1 - 2.3.6.1 + 2.3.6.2 + 2.3.6.2 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 4125eeb4..a4ff80e5 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ WinExe netcoreapp3.1 true - 2.3.6.1 - 2.3.6.1 + 2.3.6.2 + 2.3.6.2 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs b/Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs index fc14035c..ae2e492f 100644 --- a/Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs +++ b/Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs @@ -388,6 +388,7 @@ namespace Wabbajack.Lib.Downloaders using var driver = await Downloader.GetAuthedDriver(); + await ((IWaitForWindowDownloader)Downloader).WaitForNextRequestWindow(); await DeleteOldDownloadCookies(driver); //var drivercookies = await Helpers.GetCookies("loverslab.com"); diff --git a/Wabbajack.Lib/Downloaders/LoversLabDownloader.cs b/Wabbajack.Lib/Downloaders/LoversLabDownloader.cs index 3565a8f6..251f7689 100644 --- a/Wabbajack.Lib/Downloaders/LoversLabDownloader.cs +++ b/Wabbajack.Lib/Downloaders/LoversLabDownloader.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Threading; using System.Threading.Tasks; using System.Web; using HtmlAgilityPack; @@ -44,7 +45,9 @@ namespace Wabbajack.Lib.Downloaders public override async Task LoadMetaData() { - var html = await Downloader.AuthedClient.GetStringAsync(URL); + var cts = new CancellationTokenSource(); + cts.CancelAfter(Consts.MaxVerifyTime); + var html = await GetStringAsync(URL, cts.Token); var doc = new HtmlDocument(); doc.LoadHtml(html); var node = doc.DocumentNode; diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index b53855b9..571ff50d 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe netcoreapp3.1 - 2.3.6.1 - 2.3.6.1 + 2.3.6.2 + 2.3.6.2 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack.Test/DownloaderTests.cs b/Wabbajack.Test/DownloaderTests.cs index d83a5e50..6e0a238a 100644 --- a/Wabbajack.Test/DownloaderTests.cs +++ b/Wabbajack.Test/DownloaderTests.cs @@ -320,6 +320,18 @@ namespace Wabbajack.Test } + [Fact] + public async Task CanGetLLMetadata() + { + await DownloadDispatcher.GetInstance().Prepare(); + var ini = @"[General] + directURL=https://www.loverslab.com/files/file/11116-test-file-for-wabbajack-integration/?do=download&r=737123&confirm=1&t=1"; + + var state = (LoversLabDownloader.State)await DownloadDispatcher.ResolveArchive(ini.LoadIniString()); + Assert.True(await state.LoadMetaData()); + Assert.Equal("halgari", state.Author); + } + [Fact] public async Task LoversLabDownload() { diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index 7c97b8bc..0536ddf1 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.3.6.1 - 2.3.6.1 + 2.3.6.2 + 2.3.6.2 Copyright © 2019-2020 An automated ModList installer true