DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-02 10:43:31 +00:00
Code Issues Releases Wiki Activity

Update - Display exceptions

Browse Source 
Update - Run installer as admin so it well, works
This commit is contained in:
SpoinkyNL 2021-01-15 16:15:37 +01:00
parent e3c906390d
commit 36b4a10f40
2 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Artemis.UI/Screens/Settings/Dialogs/UpdateDialogViewModel.cs
View File

@ -1,4 +1,5 @@
using System.Threading.Tasks; using System;
using System.Threading.Tasks;
using Artemis.Core; using Artemis.Core;
using Artemis.UI.Services; using Artemis.UI.Services;
using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services;
@ -9,12 +10,16 @@ namespace Artemis.UI.Screens.Settings.Dialogs
public class UpdateDialogViewModel : DialogViewModelBase public class UpdateDialogViewModel : DialogViewModelBase
{ {
private readonly JToken _buildInfo; private readonly JToken _buildInfo;
private readonly IDialogService _dialogService;
private readonly IUpdateService _updateService; private readonly IUpdateService _updateService;
private bool _canUpdate = true;
public UpdateDialogViewModel(JToken buildInfo, IUpdateService updateService) public UpdateDialogViewModel(JToken buildInfo, IUpdateService updateService, IDialogService dialogService)
{ {
_buildInfo = buildInfo; _buildInfo = buildInfo;
_updateService = updateService; _updateService = updateService;
_dialogService = dialogService;
CurrentBuild = Constants.BuildInfo.BuildNumberDisplay; CurrentBuild = Constants.BuildInfo.BuildNumberDisplay;
LatestBuild = buildInfo?.SelectToken("value[0].buildNumber")?.Value<string>(); LatestBuild = buildInfo?.SelectToken("value[0].buildNumber")?.Value<string>();
} }
@ -22,9 +27,28 @@ namespace Artemis.UI.Screens.Settings.Dialogs
public string CurrentBuild { get; } public string CurrentBuild { get; }
public string LatestBuild { get; } public string LatestBuild { get; }
public bool CanUpdate
{
get => _canUpdate;
set => SetAndNotify(ref _canUpdate, value);
}
public async Task Update() public async Task Update()
{ {
await _updateService.ApplyUpdate(); try
{
CanUpdate = false;
await _updateService.ApplyUpdate();
}
catch (Exception e)
{
_dialogService.ShowExceptionDialog("An exception occurred while applying the update", e);
}
finally
{
CanUpdate = true;
}
Session.Close(); Session.Close();
} }
} }

33
src/Artemis.UI/Services/UpdateService.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
@ -110,21 +111,43 @@ namespace Artemis.UI.Services
public async Task ApplyUpdate() public async Task ApplyUpdate()
{ {
_logger.Information("Applying update"); _logger.Information("ApplyUpdate: Applying update");
// Ensure the installer is up-to-date, get installer build info // Ensure the installer is up-to-date, get installer build info
JToken buildInfo = await GetBuildInfo(6); JToken buildInfo = await GetBuildInfo(6);
JToken finishTimeToken = buildInfo?.SelectToken("value[0].finishTime");
string installerPath = Path.Combine(Constants.ApplicationFolder, "Installer", "Artemis.Installer.exe"); string installerPath = Path.Combine(Constants.ApplicationFolder, "Installer", "Artemis.Installer.exe");
// Always update installer if it is missing ^^ // Always update installer if it is missing ^^
if (!File.Exists(installerPath)) if (!File.Exists(installerPath))
await UpdateInstaller(); await UpdateInstaller();
// Compare the creation date of the installer with the build date and update if needed // Compare the creation date of the installer with the build date and update if needed
else if (File.GetLastWriteTime(installerPath) < buildInfo["finishTime"].Value<DateTime>()) else
await UpdateInstaller(); {
if (finishTimeToken == null)
_logger.Warning("ApplyUpdate: Failed to find build finish time at \"value[0].finishTime\", not updating the installer.");
else if (File.GetLastWriteTime(installerPath) < finishTimeToken.Value<DateTime>())
await UpdateInstaller();
}
_logger.Information("ApplyUpdate: Running installer at {installerPath}", installerPath);
try
{
Process.Start(new ProcessStartInfo(installerPath, "-autoupdate")
{
UseShellExecute = true,
Verb = "runas"
});
}
catch (Win32Exception e)
{
if (e.NativeErrorCode == 0x4c7)
_logger.Warning("ApplyUpdate: Operation was cancelled, user likely clicked No in UAC dialog.");
else
throw;
}
_logger.Information("Running installer at {installerPath}", installerPath);
Process.Start(installerPath, "-autoupdate");
} }
private async Task UpdateInstaller() private async Task UpdateInstaller()