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

Use a different Google Drive link to verify links during compile

Browse Source 
Using the export link to compile is kind of unreliable as the
arbitrary traffic control Google implements will affect how things
work.  Using the /file/d/ link still gives a pretty solid indication
that the file is valid and available while not needing to be able
to download the file at compile time.
This commit is contained in:
Chris Bessent 2021-02-08 19:40:51 -07:00
parent 5092d6325c
commit 945cf4f2dc
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Wabbajack.Lib/Downloaders/GoogleDriveDownloader.cs
View File

@ -40,7 +40,7 @@ namespace Wabbajack.Lib.Downloaders
public class State : AbstractDownloadState public class State : AbstractDownloadState
{ {
public string Id { get; } public string Id { get; }
[JsonIgnore] [JsonIgnore]
public override object[] PrimaryKey => new object[] { Id }; public override object[] PrimaryKey => new object[] { Id };
@ -56,35 +56,48 @@ namespace Wabbajack.Lib.Downloaders
public override async Task<bool> Download(Archive a, AbsolutePath destination) public override async Task<bool> Download(Archive a, AbsolutePath destination)
{ {
var state = await ToHttpState(); var state = await ToHttpState(download: true);
if (state == null) if (state == null)
return false; return false;
return await state.Download(a, destination); return await state.Download(a, destination);
} }
private async Task<HTTPDownloader.State?> ToHttpState() private async Task<HTTPDownloader.State?> ToHttpState(bool download)
{ {
var initialURL = $"https://drive.google.com/uc?id={Id}&export=download"; if (download)
var client = new Wabbajack.Lib.Http.Client();
using var response = await client.GetAsync(initialURL);
if (!response.IsSuccessStatusCode)
throw new HttpException((int)response.StatusCode, response.ReasonPhrase ?? "Unknown");
var cookies = response.GetSetCookies();
var warning = cookies.FirstOrDefault(c => c.Key.StartsWith("download_warning_"));
response.Dispose();
if (warning == default)
{ {
return new HTTPDownloader.State(initialURL) { Client = client }; var initialURL = $"https://drive.google.com/uc?id={Id}&export=download";
} var client = new Wabbajack.Lib.Http.Client();
using var response = await client.GetAsync(initialURL);
if (!response.IsSuccessStatusCode)
throw new HttpException((int)response.StatusCode, response.ReasonPhrase ?? "Unknown");
var cookies = response.GetSetCookies();
var warning = cookies.FirstOrDefault(c => c.Key.StartsWith("download_warning_"));
response.Dispose();
if (warning == default)
{
return new HTTPDownloader.State(initialURL) { Client = client };
}
var url = $"https://drive.google.com/uc?export=download&confirm={warning.Value}&id={Id}"; var url = $"https://drive.google.com/uc?export=download&confirm={warning.Value}&id={Id}";
var httpState = new HTTPDownloader.State(url) { Client = client }; var httpState = new HTTPDownloader.State(url) { Client = client };
return httpState; return httpState;
}
else
{
var url = $"https://drive.google.com/file/d/{Id}/edit";
var client = new Wabbajack.Lib.Http.Client();
using var response = await client.GetAsync(url, errorsAsExceptions: false);
if (!response.IsSuccessStatusCode)
throw new HttpException((int)response.StatusCode, response.ReasonPhrase ?? "Unknown");
var httpState = new HTTPDownloader.State(url) { Client = client };
return httpState;
}
} }
public override async Task<bool> Verify(Archive a, CancellationToken? token) public override async Task<bool> Verify(Archive a, CancellationToken? token)
{ {
var state = await ToHttpState(); var state = await ToHttpState(download: false);
if (state == null) if (state == null)
return false; return false;
return await state.Verify(a, token); return await state.Verify(a, token);