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

Install WebView2 after updating Wabbajack

Browse Source
This commit is contained in:
erri120 2022-11-06 12:33:52 +01:00
parent 3eb6b8c20b
commit 8475f61585
No known key found for this signature in database
2 changed files with 63 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Wabbajack.Launcher/ViewModels/MainWindowViewModel.cs
View File

@ -9,8 +9,10 @@ using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;
using MessageBox.Avalonia.DTO;
using ReactiveUI.Fody.Helpers;
using Wabbajack.Common;
using Wabbajack.Compression.Zip;
using Wabbajack.Downloaders.Http;
using Wabbajack.DTOs;
@ -49,7 +51,7 @@ public class MainWindowViewModel : ViewModelBase
private async Task CheckForUpdates()
{
await VerifyCurrentLocation();
_client.Headers.Add("user-agent", "Wabbajack Launcher");
Status = "Selecting Release";
@ -103,7 +105,7 @@ public class MainWindowViewModel : ViewModelBase
Size = _version.Size,
State = new Http {Url = uri}
};
await using var stream = await _downloader.GetChunkedSeekableStream(archive, CancellationToken.None);
var rdr = new ZipReader(stream, true);
var entries = (await rdr.GetFiles()).OrderBy(d => d.FileOffset).ToArray();
@ -115,14 +117,14 @@ public class MainWindowViewModel : ViewModelBase
var outPath = baseFolder.Combine(relPath);
if (!outPath.Parent.DirectoryExists())
outPath.Parent.CreateDirectory();
await using var of = outPath.Open(FileMode.Create, FileAccess.Write, FileShare.None);
await rdr.Extract(file, of, CancellationToken.None);
}*/
var wc = new WebClient();
wc.DownloadProgressChanged += UpdateProgress;
wc.DownloadProgressChanged += (sender, args) => UpdateProgress($"{_version.Version}", sender, args);
Status = $"Downloading {_version.Version} ...";
byte[] data;
try
@ -166,10 +168,52 @@ public class MainWindowViewModel : ViewModelBase
{
_errors.Add(ex.Message);
}
finally
try
{
await FinishAndExit();
await InstallWebView();
}
catch (Exception e)
{
_errors.Add(e.Message);
}
await FinishAndExit();
}
[UriString]
private const string WebViewDownloadLink = "https://go.microsoft.com/fwlink/p/?LinkId=2124703";
private async Task InstallWebView(CancellationToken cancellationToken = default)
{
var setupPath = KnownFolders.WabbajackAppLocal.Combine("MicrosoftEdgeWebview2Setup.exe");
if (setupPath.FileExists()) return;
var wc = new WebClient();
wc.DownloadProgressChanged += (sender, args) => UpdateProgress("WebView2", sender, args);
Status = "Downloading WebView2 Runtime";
byte[] data;
try
{
data = await wc.DownloadDataTaskAsync(WebViewDownloadLink);
}
catch (Exception ex)
{
_errors.Add(ex.Message);
await FinishAndExit();
throw;
}
await setupPath.WriteAllBytesAsync(new Memory<byte>(data), cancellationToken);
var process = new ProcessHelper
{
Path = setupPath
};
await process.Start();
}
private async Task VerifyCurrentLocation()
@ -211,6 +255,7 @@ public class MainWindowViewModel : ViewModelBase
}
}
[ContractAnnotation("=> halt")]
private async Task FinishAndExit()
{
try
@ -275,16 +320,16 @@ public class MainWindowViewModel : ViewModelBase
}
}
private void UpdateProgress(object sender, DownloadProgressChangedEventArgs e)
private void UpdateProgress(string what, object sender, DownloadProgressChangedEventArgs e)
{
Status = $"Downloading {_version.Version} ({e.ProgressPercentage}%)...";
Status = $"Downloading {what} ({e.ProgressPercentage}%)...";
}
private async Task<(Version Version, long Size, Func<Task<Uri>> Uri)> GetGithubRelease(CancellationToken token)
{
var releases = await GetGithubReleases();
var version = releases.Select(r =>
{
if (r.Tag.Split(".").Length == 4 && Version.TryParse(r.Tag, out var v))
@ -293,7 +338,7 @@ public class MainWindowViewModel : ViewModelBase
})
.OrderByDescending(r => r.Item1)
.FirstOrDefault();
var asset = version.r.Assets.FirstOrDefault(a => a.Name == version.Item1 + ".zip");
if (asset == null)
{
@ -303,7 +348,7 @@ public class MainWindowViewModel : ViewModelBase
return (version.Item1, asset.Size, async () => asset!.BrowserDownloadUrl);
}
private async Task<Release[]> GetGithubReleases()
{
Status = "Checking GitHub Repository";
@ -311,13 +356,13 @@ public class MainWindowViewModel : ViewModelBase
Status = "Parsing Response";
return JsonSerializer.Deserialize<Release[]>(data)!;
}
private async Task<(Version Version, long Size, Func<Task<Uri>> uri)> GetNexusReleases(CancellationToken token)
{
Status = "Checking Nexus for updates";
if (!await _nexusApi.IsPremium(token))
return default;
var data = await _nexusApi.ModFiles("site", 403, token);
Status = "Parsing Response";
//return JsonSerializer.Deserialize<Release[]>(data)!;
@ -351,7 +396,7 @@ public class MainWindowViewModel : ViewModelBase
[JsonPropertyName("name")] public string Name { get; set; }
[JsonPropertyName("size")] public long Size { get; set; }
}
}
}

1
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -27,6 +27,7 @@
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview3" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview3" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview3" />
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
<PackageReference Include="MessageBox.Avalonia" Version="2.3.1-prev2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0-rc.2.22472.3" />
<PackageReference Include="ReactiveUI.Fody" Version="18.3.1" />