mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-23 11:16:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Check if auto-update is enabled in UpdateService

Browse source
This commit is contained in:
Alexey Golub 2020-01-03 21:44:30 +02:00
parent 3af9421304
commit cec8409ac4
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
DiscordChatExporter.Gui/Services/UpdateService.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using DiscordChatExporter.Core.Services;
using Onova; using Onova;
using Onova.Exceptions; using Onova.Exceptions;
using Onova.Services; using Onova.Services;
@ -12,17 +13,30 @@ namespace DiscordChatExporter.Gui.Services
new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"), new GithubPackageResolver("Tyrrrz", "DiscordChatExporter", "DiscordChatExporter.zip"),
new ZipPackageExtractor()); new ZipPackageExtractor());
private readonly SettingsService _settingsService;
private Version? _updateVersion; private Version? _updateVersion;
private bool _updaterLaunched; private bool _updaterLaunched;
public UpdateService(SettingsService settingsService)
{
_settingsService = settingsService;
}
public async Task<Version?> CheckForUpdatesAsync() public async Task<Version?> CheckForUpdatesAsync()
{ {
if (!_settingsService.IsAutoUpdateEnabled)
return null;
var check = await _updateManager.CheckForUpdatesAsync(); var check = await _updateManager.CheckForUpdatesAsync();
return check.CanUpdate ? check.LastVersion : null; return check.CanUpdate ? check.LastVersion : null;
} }
public async Task PrepareUpdateAsync(Version version) public async Task PrepareUpdateAsync(Version version)
{ {
if (!_settingsService.IsAutoUpdateEnabled)
return;
try try
{ {
await _updateManager.PrepareUpdateAsync(_updateVersion = version); await _updateManager.PrepareUpdateAsync(_updateVersion = version);
@ -39,13 +53,15 @@ namespace DiscordChatExporter.Gui.Services
public void FinalizeUpdate(bool needRestart) public void FinalizeUpdate(bool needRestart)
{ {
if (!_settingsService.IsAutoUpdateEnabled)
return;
if (_updateVersion == null || _updaterLaunched)
return;
try try
{ {
if (_updateVersion == null || _updaterLaunched)
return;
_updateManager.LaunchUpdater(_updateVersion, needRestart); _updateManager.LaunchUpdater(_updateVersion, needRestart);
_updaterLaunched = true; _updaterLaunched = true;
} }
catch (UpdaterAlreadyLaunchedException) catch (UpdaterAlreadyLaunchedException)

4
DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
View file

@ -69,10 +69,6 @@ namespace DiscordChatExporter.Gui.ViewModels
{ {
try try
{ {
// Don't check for updates if auto-update is disabled
if (!_settingsService.IsAutoUpdateEnabled)
return;
// Check for updates // Check for updates
var updateVersion = await _updateService.CheckForUpdatesAsync(); var updateVersion = await _updateService.CheckForUpdatesAsync();
if (updateVersion == null) if (updateVersion == null)