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

Improve the GoogleDrive Downloader a bit

Browse Source
This commit is contained in:
Timothy Baldridge 2021-02-18 17:09:12 -07:00
parent 831318c7eb
commit 401c2d232f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
using System.Linq;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
@ -6,6 +7,7 @@ using Newtonsoft.Json;
using Wabbajack.Common;
using Wabbajack.Common.Exceptions;
using Wabbajack.Common.Serialization.Json;
using Wabbajack.Lib.Http;
using Wabbajack.Lib.Validation;
namespace Wabbajack.Lib.Downloaders
@ -67,12 +69,15 @@ namespace Wabbajack.Lib.Downloaders
using var response = await client.GetAsync(initialURL);
if (!response.IsSuccessStatusCode)
throw new HttpException((int)response.StatusCode, response.ReasonPhrase ?? "Unknown");
var regex = new Regex("(?<=/uc\\?export=download&amp;confirm=).*(?=;id=)");
using var content = response.Content;
var confirm = regex.Match(await content.ReadAsStringAsync());
if (!confirm.Success)
return null;
var url = $"https://drive.google.com/uc?export=download&confirm={confirm}&id={Id}";
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 httpState = new HTTPDownloader.State(url) { Client = client };
return httpState;
}

3
Wabbajack.Test/DownloaderTests.cs
View File

@ -113,6 +113,9 @@ namespace Wabbajack.Test
Assert.Equal(Hash.FromBase64("eSIyd+KOG3s="), await filename.Path.FileHashAsync());
Assert.Equal("Cheese for Everyone!", await filename.Path.ReadAllTextAsync());
var newState = (AbstractDownloadState)new GoogleDriveDownloader.State("1Q_CdeYJStfoTZFLZ79RRVkxI2c_cG0dg");
Assert.True(await newState.Verify(new Archive(newState) {Size = 0}));
}
[Fact]