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

Fix IPS4 Verification

Browse Source
This commit is contained in:
Timothy Baldridge 2020-04-23 19:58:18 -06:00
parent 69c3f2ebcb
commit 8f08ac8003
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ namespace Wabbajack.Lib.Downloaders
public override async Task<bool> Download(Archive a, AbsolutePath destination)
{
await using var stream = await ResolveDownloadStream();
await using var stream = await ResolveDownloadStream(a);
if (stream == null) return false;
await using (var file = destination.Create())
{
@ -129,7 +129,7 @@ namespace Wabbajack.Lib.Downloaders
return true;
}
private async Task<Stream?> ResolveDownloadStream()
private async Task<Stream?> ResolveDownloadStream(Archive a)
{
TOP:
string url;
@ -167,7 +167,22 @@ namespace Wabbajack.Lib.Downloaders
var contentType = streamResult.Content.Headers.ContentType;
if (contentType.MediaType != "application/json")
{
var headerVar = a.Size == 0 ? "1" : a.Size.ToString();
long headerContentSize = 0;
if (streamResult.Content.Headers.Contains("Content-Length"))
{
headerVar = streamResult.Content.Headers.GetValues("Content-Length").FirstOrDefault();
if (headerVar != null)
long.TryParse(headerVar, out headerContentSize);
}
if (a.Size != 0 && headerContentSize != 0 && a.Size != headerContentSize)
return null;
return await streamResult.Content.ReadAsStreamAsync();
}
// Sometimes LL hands back a json object telling us to wait until a certain time
var times = (await streamResult.Content.ReadAsStringAsync()).FromJsonString<WaitResponse>();
@ -192,7 +207,7 @@ namespace Wabbajack.Lib.Downloaders
public override async Task<bool> Verify(Archive a)
{
var stream = await ResolveDownloadStream();
var stream = await ResolveDownloadStream(a);
if (stream == null)
return false;

7
Wabbajack.Test/DownloaderTests.cs
View File

@ -292,10 +292,15 @@ namespace Wabbajack.Test
Assert.Equal("http://build.wabbajack.org/WABBAJACK_TEST_FILE.txt",
((HTTPDownloader.State)url_state).Url);
*/
var converted = RoundTripState(state);
Assert.True(await converted.Verify(new Archive(state: null!) { Size = 20}));
using var filename = new TempFile();
// Verify with different Size
Assert.False(await converted.Verify(new Archive(state: null!) { Size = 15}));
using var filename = new TempFile();
Assert.True(converted.IsWhitelisted(new ServerWhitelist { AllowedPrefixes = new List<string>() }));
await converted.Download(new Archive(state: null!) { Name = "LoversLab Test.txt" }, filename.Path);