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 manual downloads sometimes launching in browser

Browse Source
This commit is contained in:
UrbanCMC
2023-08-09 21:03:56 +02:00
parent 77f6b8c9cb
commit ae7402be58
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Wabbajack.App.Wpf/UserIntervention/ManualDownloadHandler.cs
View File

@ -1,10 +1,7 @@
using System.Security.Policy;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Wabbajack.DTOs;
using Wabbajack.DTOs.DownloadStates; using Wabbajack.DTOs.DownloadStates;
using Wabbajack.DTOs.Interventions; using Wabbajack.DTOs.Interventions;
using Wabbajack.Paths;
namespace Wabbajack.UserIntervention; namespace Wabbajack.UserIntervention;
@ -21,13 +18,13 @@ public class ManualDownloadHandler : BrowserWindowViewModel
HeaderText = $"Manual download ({md.Url.Host})"; HeaderText = $"Manual download ({md.Url.Host})";
Instructions = string.IsNullOrWhiteSpace(md.Prompt) ? $"Please download {archive.Name}" : md.Prompt; Instructions = string.IsNullOrWhiteSpace(md.Prompt) ? $"Please download {archive.Name}" : md.Prompt;
await NavigateTo(md.Url);
var task = WaitForDownloadUri(token, async () =>
var uri = await WaitForDownloadUri(token, async () =>
{ {
await RunJavaScript("Array.from(document.getElementsByTagName(\"iframe\")).forEach(f => f.remove())"); await RunJavaScript("Array.from(document.getElementsByTagName(\"iframe\")).forEach(f => f.remove())");
}); });
await NavigateTo(md.Url);
var uri = await task;
Intervention.Finish(uri); Intervention.Finish(uri);
} }

4
Wabbajack.App.Wpf/View Models/BrowserWindowViewModel.cs
View File

@ -112,11 +112,13 @@ public abstract class BrowserWindowViewModel : ViewModel
{ {
var source = new TaskCompletionSource<Uri>(); var source = new TaskCompletionSource<Uri>();
var referer = _browser.Source; var referer = _browser.Source;
while (_browser.CoreWebView2 == null)
await Task.Delay(10, token);
_browser.CoreWebView2.DownloadStarting += (sender, args) => _browser.CoreWebView2.DownloadStarting += (sender, args) =>
{ {
try try
{ {
source.SetResult(new Uri(args.DownloadOperation.Uri)); source.SetResult(new Uri(args.DownloadOperation.Uri));
} }
catch (Exception) catch (Exception)