Merge remote-tracking branch 'origin/master' into game-sourced-downloads

This commit is contained in:
Timothy Baldridge 2020-05-04 15:45:45 -06:00
commit daf7eba26a
2 changed files with 6 additions and 12 deletions

View File

@ -50,18 +50,11 @@ namespace Wabbajack.Lib.Downloaders
private async Task<HTTPDownloader.State?> Resolve() private async Task<HTTPDownloader.State?> Resolve()
{ {
using (var d = await Driver.Create()) var client = new Common.Http.Client();
{ var body = await client.GetHtmlAsync(Url);
await d.NavigateTo(new Uri(Url)); var node = body.DocumentNode.DescendantsAndSelf().First(d => d.HasClass("input") && d.HasClass("popsok") &&
// MediaFire creates the link after all the JS loads d.GetAttributeValue("aria-label", "") == "Download file");
await Task.Delay(1000); return new HTTPDownloader.State(node.GetAttributeValue("href", "not-found"));
var newURL = await d.GetAttr("a.input", "href");
if (newURL == null || !newURL.StartsWith("http")) return null;
return new HTTPDownloader.State(newURL)
{
Client = new Common.Http.Client(),
};
}
} }
public override IDownloader GetDownloader() public override IDownloader GetDownloader()

View File

@ -14,6 +14,7 @@ namespace Wabbajack.Lib.WebAutomation
public Driver() public Driver()
{ {
_browser = new ChromiumWebBrowser(); _browser = new ChromiumWebBrowser();
_driver = new CefSharpWrapper(_browser); _driver = new CefSharpWrapper(_browser);