Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d65c556656 | |||
| fe3941d8bd | |||
| 89d750fbe6 |
@@ -1,4 +1,5 @@
|
||||
using LibreHardwareMonitor.Hardware;
|
||||
using Serilog;
|
||||
|
||||
namespace HardwareMonitorStatusWindow.Service;
|
||||
|
||||
@@ -12,6 +13,8 @@ public class HardwareMonitorService : IHardwareMonitorService
|
||||
|
||||
static HardwareMonitorService()
|
||||
{
|
||||
Log.Information("Creating computer");
|
||||
|
||||
Computer = new Computer
|
||||
{
|
||||
IsCpuEnabled = true,
|
||||
@@ -25,6 +28,8 @@ public class HardwareMonitorService : IHardwareMonitorService
|
||||
IsPsuEnabled = true
|
||||
};
|
||||
|
||||
Log.Information("Opening computer");
|
||||
|
||||
Computer.Open();
|
||||
|
||||
HardwareUpdateVisitor = new HardwareUpdateVisitor();
|
||||
@@ -32,8 +37,12 @@ public class HardwareMonitorService : IHardwareMonitorService
|
||||
|
||||
public IEnumerable<Hardware> GetHardware()
|
||||
{
|
||||
Log.Information("Updating computer");
|
||||
|
||||
Computer.Accept(HardwareUpdateVisitor);
|
||||
|
||||
Log.Information("Creating hardware entries");
|
||||
|
||||
var hardwareEntries = Computer.Hardware.Select(Hardware.Create);
|
||||
|
||||
return hardwareEntries;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using Serilog;
|
||||
using HardwareMonitorStatusWindow.Service;
|
||||
using Microsoft.Win32.TaskScheduler;
|
||||
using Serilog;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using Velopack;
|
||||
@@ -17,7 +19,30 @@ internal class Program
|
||||
|
||||
Log.Information("Start");
|
||||
|
||||
VelopackApp.Build().SetLogger(new SerilogVelopackLogger()).Run();
|
||||
var stopServiceHook = new VelopackHook(_ =>
|
||||
{
|
||||
try
|
||||
{
|
||||
using var taskService = new TaskService();
|
||||
|
||||
Log.Information("Checking for task name: {name}", HardwareMonitorService.ScheduledTaskName);
|
||||
|
||||
var existingTask = taskService.FindTask(HardwareMonitorService.ScheduledTaskName);
|
||||
|
||||
Log.Information("Task: {existingTask}", existingTask);
|
||||
|
||||
Log.Information("Stopping task");
|
||||
|
||||
existingTask?.Stop();
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
// Ignored
|
||||
Log.Error(exception, "");
|
||||
}
|
||||
});
|
||||
|
||||
VelopackApp.Build().OnBeforeUpdateFastCallback(stopServiceHook).OnBeforeUninstallFastCallback(stopServiceHook).SetLogger(new SerilogVelopackLogger()).Run();
|
||||
|
||||
var app = new App();
|
||||
app.InitializeComponent();
|
||||
|
||||
@@ -9,9 +9,9 @@ namespace HardwareMonitorStatusWindow.StatusWindow;
|
||||
|
||||
internal static class UpdateCheck
|
||||
{
|
||||
private static UpdateManager _updateManager;
|
||||
private static UpdateManager? _updateManager;
|
||||
|
||||
public static UpdateManager UpdateManager => _updateManager ??= new UpdateManager(new GithubSource("https://gitea.kaczorzoo.net/ckaczor/HardwareMonitorStatusWindow", null, false));
|
||||
public static UpdateManager UpdateManager => _updateManager ??= new UpdateManager(new GiteaSource("https://gitea.kaczorzoo.net/ckaczor/HardwareMonitorStatusWindow", null, false));
|
||||
|
||||
public static string LocalVersion => (UpdateManager.CurrentVersion ?? new SemanticVersion(0, 0, 0)).ToString();
|
||||
|
||||
|
||||
@@ -120,6 +120,8 @@ internal class WindowSource : IWindowSource, IDisposable
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e, nameof(UpdateApp));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user