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 #1237 from wabbajack-tools/fix-ll-meta-lookup

Browse Source 
Fix ll meta lookup
This commit is contained in:
Timothy Baldridge 2020-12-31 14:08:48 -07:00 committed by GitHub
commit 1ba7c2ed4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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
@ -8,6 +11,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

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

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

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

@ -4,8 +4,8 @@
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
<AssemblyVersion>2.3.6.1</AssemblyVersion>
<FileVersion>2.3.6.1</FileVersion>
<AssemblyVersion>2.3.6.2</AssemblyVersion>
<FileVersion>2.3.6.2</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun>

1
Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs
View File

@ -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");

5
Wabbajack.Lib/Downloaders/LoversLabDownloader.cs
View File

@ -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<bool> 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;

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

@ -3,8 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyVersion>2.3.6.1</AssemblyVersion>
<FileVersion>2.3.6.1</FileVersion>
<AssemblyVersion>2.3.6.2</AssemblyVersion>
<FileVersion>2.3.6.2</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

12
Wabbajack.Test/DownloaderTests.cs
View File

@ -320,6 +320,18 @@ namespace Wabbajack.Test
}
[Fact]
public async Task CanGetLLMetadata()
{
await DownloadDispatcher.GetInstance<LoversLabDownloader>().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()
{

4
Wabbajack/Wabbajack.csproj
View File

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