mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
Merge pull request #1361 from LostDragonist/launcher_updates
Launcher updates
This commit is contained in:
commit
af7ad75085
@ -9,6 +9,7 @@ using System.Runtime.CompilerServices;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Wabbajack.Launcher.Annotations;
|
using Wabbajack.Launcher.Annotations;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace Wabbajack.Launcher
|
namespace Wabbajack.Launcher
|
||||||
{
|
{
|
||||||
@ -27,6 +28,7 @@ namespace Wabbajack.Launcher
|
|||||||
|
|
||||||
private string _status = "Checking for Updates";
|
private string _status = "Checking for Updates";
|
||||||
private Release _version;
|
private Release _version;
|
||||||
|
private List<string> _errors = new List<string>();
|
||||||
|
|
||||||
public string Status
|
public string Status
|
||||||
{
|
{
|
||||||
@ -61,30 +63,60 @@ namespace Wabbajack.Launcher
|
|||||||
return new Version(0, 0, 0, 0);
|
return new Version(0, 0, 0, 0);
|
||||||
}).FirstOrDefault();
|
}).FirstOrDefault();
|
||||||
}
|
}
|
||||||
catch (Exception)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
FinishAndExit();
|
_errors.Add(ex.Message);
|
||||||
|
await FinishAndExit();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_version == null)
|
if (_version == null)
|
||||||
FinishAndExit();
|
{
|
||||||
|
_errors.Add("Unable to parse Github releases");
|
||||||
|
await FinishAndExit();
|
||||||
|
}
|
||||||
|
|
||||||
Status = "Looking for Updates";
|
Status = "Looking for Updates";
|
||||||
|
|
||||||
var base_folder = Path.Combine(Directory.GetCurrentDirectory(), _version.Tag);
|
var base_folder = Path.Combine(Directory.GetCurrentDirectory(), _version.Tag);
|
||||||
|
|
||||||
if (File.Exists(Path.Combine(base_folder, "Wabbajack.exe")))
|
if (File.Exists(Path.Combine(base_folder, "Wabbajack.exe")))
|
||||||
FinishAndExit();
|
{
|
||||||
|
await FinishAndExit();
|
||||||
|
}
|
||||||
|
|
||||||
var asset = _version.Assets.FirstOrDefault(a => a.Name == _version.Tag + ".zip");
|
var asset = _version.Assets.FirstOrDefault(a => a.Name == _version.Tag + ".zip");
|
||||||
if (asset == null)
|
if (asset == null)
|
||||||
FinishAndExit();
|
{
|
||||||
|
_errors.Add("No zip file for release " + _version.Tag);
|
||||||
|
await FinishAndExit();
|
||||||
|
}
|
||||||
|
|
||||||
var wc = new WebClient();
|
var wc = new WebClient();
|
||||||
wc.DownloadProgressChanged += UpdateProgress;
|
wc.DownloadProgressChanged += UpdateProgress;
|
||||||
Status = $"Downloading {_version.Tag} ...";
|
Status = $"Downloading {_version.Tag} ...";
|
||||||
var data = await wc.DownloadDataTaskAsync(asset.BrowserDownloadUrlFast);
|
byte[] data;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
data = await wc.DownloadDataTaskAsync(asset.BrowserDownloadUrlFast);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_errors.Add(ex.Message);
|
||||||
|
// Something went wrong so fallback to original URL
|
||||||
|
try
|
||||||
|
{
|
||||||
|
data = await wc.DownloadDataTaskAsync(asset.BrowserDownloadUrl);
|
||||||
|
}
|
||||||
|
catch (Exception ex2)
|
||||||
|
{
|
||||||
|
_errors.Add(ex2.Message);
|
||||||
|
await FinishAndExit();
|
||||||
|
throw; // avoid unsigned variable 'data'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
using (var zip = new ZipArchive(new MemoryStream(data), ZipArchiveMode.Read))
|
using (var zip = new ZipArchive(new MemoryStream(data), ZipArchiveMode.Read))
|
||||||
{
|
{
|
||||||
foreach (var entry in zip.Entries)
|
foreach (var entry in zip.Entries)
|
||||||
@ -101,10 +133,21 @@ namespace Wabbajack.Launcher
|
|||||||
await o.CopyToAsync(of);
|
await o.CopyToAsync(of);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FinishAndExit();
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_errors.Add(ex.Message);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
await FinishAndExit();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void FinishAndExit()
|
}
|
||||||
|
|
||||||
|
private async Task FinishAndExit()
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
Status = "Launching...";
|
Status = "Launching...";
|
||||||
var wjFolder = Directory.EnumerateDirectories(Directory.GetCurrentDirectory())
|
var wjFolder = Directory.EnumerateDirectories(Directory.GetCurrentDirectory())
|
||||||
@ -118,8 +161,25 @@ namespace Wabbajack.Launcher
|
|||||||
WorkingDirectory = wjFolder,
|
WorkingDirectory = wjFolder,
|
||||||
};
|
};
|
||||||
Process.Start(info);
|
Process.Start(info);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
if (_errors.Count == 0)
|
||||||
|
{
|
||||||
|
Status = "Failed: Unknown error";
|
||||||
|
await Task.Delay(10000);
|
||||||
|
}
|
||||||
|
foreach (var error in _errors)
|
||||||
|
{
|
||||||
|
Status = "Failed: " + error;
|
||||||
|
await Task.Delay(10000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void UpdateProgress(object sender, DownloadProgressChangedEventArgs e)
|
private void UpdateProgress(object sender, DownloadProgressChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user