mirror of
https://github.com/ckaczor/WorldClockStatusWindow.git
synced 2026-01-14 17:28:25 -05:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e732fe9d91 | |||
| 3a189986da |
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@@ -5,6 +5,8 @@ on:
|
||||
branches:
|
||||
- main
|
||||
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
deploy-to-github-releases:
|
||||
runs-on: windows-latest
|
||||
@@ -31,4 +33,4 @@ jobs:
|
||||
dotnet tool install -g vpk
|
||||
vpk download github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow
|
||||
vpk pack -u WorldClockStatusWindow -v ${{ steps.version.outputs.version }} -p publish
|
||||
vpk upload github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow --publish --releaseName "WorldClockStatusWindow ${{ steps.version.outputs.version }}" --tag v${{ steps.version.outputs.version }} --token ${{ secrets.GITHUB_TOKEN }}
|
||||
vpk upload github --repoUrl https://github.com/ckaczor/WorldClockStatusWindow --publish --releaseName "${{ steps.version.outputs.version }}" --tag v${{ steps.version.outputs.version }} --token ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -1,4 +1,5 @@
|
||||
using ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
|
||||
using Serilog;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
@@ -8,11 +9,8 @@ using System.Text.Json;
|
||||
using System.Threading.Tasks;
|
||||
using System.Timers;
|
||||
using System.Windows.Threading;
|
||||
using Serilog;
|
||||
using Serilog.Core;
|
||||
using Velopack;
|
||||
using Velopack.Sources;
|
||||
using WorldClockStatusWindow.Properties;
|
||||
|
||||
namespace WorldClockStatusWindow;
|
||||
|
||||
@@ -37,7 +35,7 @@ internal class WindowSource : IWindowSource, IDisposable
|
||||
|
||||
_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()
|
||||
@@ -47,6 +45,8 @@ internal class WindowSource : IWindowSource, IDisposable
|
||||
if (!_updateManager.IsInstalled)
|
||||
return false;
|
||||
|
||||
Log.Logger.Information("Checking for update");
|
||||
|
||||
await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Checking for update..."));
|
||||
|
||||
var newVersion = await _updateManager.CheckForUpdatesAsync();
|
||||
@@ -54,10 +54,14 @@ internal class WindowSource : IWindowSource, IDisposable
|
||||
if (newVersion == null)
|
||||
return false;
|
||||
|
||||
Log.Logger.Information("Downloading update");
|
||||
|
||||
await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Downloading update..."));
|
||||
|
||||
await _updateManager.DownloadUpdatesAsync(newVersion);
|
||||
|
||||
Log.Logger.Information("Installing update");
|
||||
|
||||
await _dispatcher.InvokeAsync(() => _floatingStatusWindow.SetText("Installing update..."));
|
||||
|
||||
_updateManager.ApplyUpdatesAndRestart(newVersion);
|
||||
@@ -70,10 +74,19 @@ internal class WindowSource : IWindowSource, IDisposable
|
||||
return true;
|
||||
}
|
||||
|
||||
private void Start()
|
||||
private void Start(bool hasUpdate)
|
||||
{
|
||||
Log.Logger.Information($"Start: hasUpdate={hasUpdate}");
|
||||
|
||||
if (hasUpdate)
|
||||
return;
|
||||
|
||||
Log.Logger.Information("Load");
|
||||
|
||||
Load();
|
||||
|
||||
Log.Logger.Information("Starting timer");
|
||||
|
||||
_timer.Elapsed += HandleTimerElapsed;
|
||||
_timer.Enabled = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user