ckaczor/WorldClockStatusWindow
1
0
Fork 0
mirror of https://github.com/ckaczor/WorldClockStatusWindow.git synced 2026-01-13 17:23:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust startup

Browse Source
This commit is contained in:
Chris Kaczor
2024-09-26 20:53:27 -04:00
parent adab62394b
commit 3a189986da
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
WindowSource.cs
View File

@@ -1,4 +1,5 @@
using ChrisKaczor.Wpf.Windows.FloatingStatusWindow; using ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
using Serilog;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -8,11 +9,8 @@ using System.Text.Json;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Timers; using System.Timers;
using System.Windows.Threading; using System.Windows.Threading;
using Serilog;
using Serilog.Core;
using Velopack; using Velopack;
using Velopack.Sources; using Velopack.Sources;
using WorldClockStatusWindow.Properties;
namespace WorldClockStatusWindow; namespace WorldClockStatusWindow;
@@ -37,7 +35,7 @@ internal class WindowSource : IWindowSource, IDisposable
_timer = new Timer(1000); _timer = new Timer(1000);
Task.Factory.StartNew(UpdateApp).ContinueWith(_ => Start()); Task.Factory.StartNew(UpdateApp).ContinueWith(task => Start(task.Result.Result));
} }
private async Task<bool> UpdateApp() private async Task<bool> UpdateApp()
@@ -47,6 +45,8 @@ internal class WindowSource : IWindowSource, IDisposable
if (!_updateManager.IsInstalled) if (!_updateManager.IsInstalled)
return false; return false;
Log.Logger.Information("Checking for update");
await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Checking for update...")); await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Checking for update..."));
var newVersion = await _updateManager.CheckForUpdatesAsync(); var newVersion = await _updateManager.CheckForUpdatesAsync();
@@ -54,10 +54,14 @@ internal class WindowSource : IWindowSource, IDisposable
if (newVersion == null) if (newVersion == null)
return false; return false;
Log.Logger.Information("Downloading update");
await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Downloading update...")); await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Downloading update..."));
await _updateManager.DownloadUpdatesAsync(newVersion); await _updateManager.DownloadUpdatesAsync(newVersion);
Log.Logger.Information("Installing update");
await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Installing update...")); await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Installing update..."));
_updateManager.ApplyUpdatesAndRestart(newVersion); _updateManager.ApplyUpdatesAndRestart(newVersion);
@@ -70,10 +74,19 @@ internal class WindowSource : IWindowSource, IDisposable
return true; return true;
} }
private void Start() private void Start(bool hasUpdate)
{ {
Log.Logger.Information($"Start: hasUpdate={hasUpdate}");
if (hasUpdate)
return;
Log.Logger.Information("Load");
Load(); Load();
Log.Logger.Information("Starting timer");
_timer.Elapsed += HandleTimerElapsed; _timer.Elapsed += HandleTimerElapsed;
_timer.Enabled = true; _timer.Enabled = true;
} }