Refactor monitoring loops to use IntervalAction utility

Directory.Packages.props

@@ -35,6 +35,7 @@
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
 
     <!-- ktsu packages -->
+    <PackageVersion Include="ktsu.IntervalAction" Version="1.3.10" />
     <PackageVersion Include="ktsu.AppDataStorage" Version="1.16.14" />
     <PackageVersion Include="ktsu.Extensions" Version="1.5.14" />
     <PackageVersion Include="ktsu.RunCommand" Version="1.3.5" />

KtsuTools.BuildMonitor/BuildMonitorService.cs

@@ -10,6 +10,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Humanizer;
+using ktsu.IntervalAction;
 using KtsuTools.Core.Services.GitHub;
 using Spectre.Console;
 using Spectre.Console.Rendering;
@@ -37,31 +38,42 @@
 			.AutoClear(true)
 			.StartAsync(async ctx =>
 			{
-				while (!ct.IsCancellationRequested)
+				TimeSpan interval = TimeSpan.FromSeconds(refreshIntervalSeconds);
+
+				void Tick()
 				{
 					try
 					{
-						Table table = await BuildDashboardTableAsync(owner, ct).ConfigureAwait(false);
+						Table table = BuildDashboardTableAsync(owner, ct).GetAwaiter().GetResult();
 						ctx.UpdateTarget(table);
 					}
 					catch (OperationCanceledException)
 					{
-						break;
 					}
 					catch (HttpRequestException ex)
 					{
 						ctx.UpdateTarget(new Markup($"[red]API Error: {ex.Message.EscapeMarkup()}[/]"));
 					}
+				}
 
-					try
-					{
-						await Task.Delay(TimeSpan.FromSeconds(refreshIntervalSeconds), ct).ConfigureAwait(false);
-					}
-					catch (OperationCanceledException)
-					{
-						break;
-					}
+				Tick();
+
+				IntervalAction ticker = IntervalAction.Start(new IntervalActionOptions
+				{
+					ActionInterval = interval,
+					PollingInterval = interval,
+					Action = Tick,
+				});
+
+				try
+				{
+					await Task.Delay(Timeout.InfiniteTimeSpan, ct).ConfigureAwait(false);
 				}
+				catch (OperationCanceledException)
+				{
+				}
+
+				ticker.Stop();
 			}).ConfigureAwait(false);
 	}
 

KtsuTools.BuildMonitor/KtsuTools.BuildMonitor.csproj

@@ -11,6 +11,7 @@
     <PackageReference Include="Spectre.Console" />
     <PackageReference Include="Humanizer.Core" ExcludeAssets="analyzers" />
     <PackageReference Include="ktsu.TextFilter" />
+    <PackageReference Include="ktsu.IntervalAction" />
   </ItemGroup>
 
   <ItemGroup>

KtsuTools.CodeGen/CodeGenService.cs

@@ -285,6 +285,7 @@ public class CodeGenService
 	public async Task<int> GenerateAsync(AbsoluteFilePath inputFile, string language, AbsoluteFilePath? outputFile = null, CancellationToken ct = default)
 #pragma warning restore CA1822
 	{
+		Ensure.NotNull(inputFile);
 		Ensure.NotNull(language);
 
 		string fullPath = inputFile.ToString();

KtsuTools.FileExplorer/FileExplorerService.cs

@@ -62,6 +62,8 @@ public class FileExplorerService
 	public async Task<int> RunAsync(AbsoluteDirectoryPath startPath, bool showHidden = false, bool showSizes = true, CancellationToken ct = default)
 #pragma warning restore CA1822
 	{
+		Ensure.NotNull(startPath);
+
 		string currentPath = startPath.ToString();
 
 		if (!Directory.Exists(currentPath))

KtsuTools.Machine/KtsuTools.Machine.csproj

@@ -11,6 +11,7 @@
     <PackageReference Include="Spectre.Console" />
     <PackageReference Include="LibreHardwareMonitorLib" />
     <PackageReference Include="Humanizer.Core" ExcludeAssets="analyzers" />
+    <PackageReference Include="ktsu.IntervalAction" />
   </ItemGroup>
 
   <ItemGroup>

KtsuTools.Machine/MachineMonitorService.cs

@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using ktsu.IntervalAction;
 using LibreHardwareMonitor.Hardware;
 using Spectre.Console;
 using Spectre.Console.Rendering;
@@ -48,31 +49,33 @@
 			AnsiConsole.WriteLine();
 
 			IRenderable initial = new Text("Loading hardware sensors...");
+			Computer computerCapture = computer;
 			await AnsiConsole.Live(initial)
 				.AutoClear(true)
 				.StartAsync(async ctx =>
 				{
-					while (!ct.IsCancellationRequested)
+					TimeSpan interval = TimeSpan.FromMilliseconds(refreshIntervalMs);
+
+					void Tick() => ctx.UpdateTarget(BuildDashboard(computerCapture));
+
+					Tick();
+
+					IntervalAction ticker = IntervalAction.Start(new IntervalActionOptions
+					{
+						ActionInterval = interval,
+						PollingInterval = interval,
+						Action = Tick,
+					});
+
+					try
+					{
+						await Task.Delay(Timeout.InfiniteTimeSpan, ct).ConfigureAwait(false);
+					}
+					catch (OperationCanceledException)
 					{
-						try
-						{
-							Table dashboard = BuildDashboard(computer);
-							ctx.UpdateTarget(dashboard);
-						}
-						catch (OperationCanceledException)
-						{
-							break;
-						}
-
-						try
-						{
-							await Task.Delay(refreshIntervalMs, ct).ConfigureAwait(false);
-						}
-						catch (OperationCanceledException)
-						{
-							break;
-						}
 					}
+
+					ticker.Stop();
 				}).ConfigureAwait(false);
 		}
 		finally

KtsuTools.MemFrag/KtsuTools.MemFrag.csproj

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Spectre.Console" />
+    <PackageReference Include="ktsu.IntervalAction" />
   </ItemGroup>
 
   <ItemGroup>

KtsuTools.MemFrag/MemFragService.cs

@@ -9,6 +9,7 @@
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using ktsu.IntervalAction;
 using Spectre.Console;
 using Spectre.Console.Rendering;
 
@@ -78,33 +79,46 @@
 			AnsiConsole.WriteLine();
 
 			IRenderable initial = new Text("Loading...");
+			Process processCapture = process;
 			await AnsiConsole.Live(initial)
 				.AutoClear(true)
 				.StartAsync(async ctx =>
 				{
-					while (!ct.IsCancellationRequested)
+					using CancellationTokenSource exitedCts = CancellationTokenSource.CreateLinkedTokenSource(ct);
+					TimeSpan interval = TimeSpan.FromMilliseconds(refreshIntervalMs);
+
+					void Tick()
 					{
 						try
 						{
-							process.Refresh();
-							Table table = BuildMemoryTable(process);
-							ctx.UpdateTarget(table);
+							processCapture.Refresh();
+							ctx.UpdateTarget(BuildMemoryTable(processCapture));
 						}
 						catch (InvalidOperationException)
 						{
 							ctx.UpdateTarget(new Markup("[red]Process has exited.[/]"));
-							break;
+							exitedCts.Cancel();
 						}
+					}
 
-						try
-						{
-							await Task.Delay(refreshIntervalMs, ct).ConfigureAwait(false);
-						}
-						catch (OperationCanceledException)
-						{
-							break;
-						}
+					Tick();
+
+					IntervalAction ticker = IntervalAction.Start(new IntervalActionOptions
+					{
+						ActionInterval = interval,
+						PollingInterval = interval,
+						Action = Tick,
+					});
+
+					try
+					{
+						await Task.Delay(Timeout.InfiniteTimeSpan, exitedCts.Token).ConfigureAwait(false);
 					}
+					catch (OperationCanceledException)
+					{
+					}
+
+					ticker.Stop();
 				}).ConfigureAwait(false);
 		}
 

KtsuTools.Merge/MergeService.cs

@@ -57,6 +57,7 @@ public class MergeService
 	public async Task<int> RunMergeAsync(AbsoluteDirectoryPath directory, string filename, CancellationToken ct = default)
 #pragma warning restore CA1822
 	{
+		Ensure.NotNull(directory);
 		Ensure.NotNull(filename);
 
 		string fullPath = directory.ToString();

KtsuTools/Commands/SyncCommand.cs

@@ -38,7 +38,9 @@ public sealed class Settings : CommandSettings
 		/// </summary>
 		[CommandOption("--filename <FILENAME>")]
 		[Description("Filename pattern to scan for. Repeat the flag or pass a comma-separated list to sync several files in one run.")]
+#pragma warning disable CA1819 // Properties should not return arrays - Spectre.Console.Cli binds multi-value options via T[] only.
 		public string[] Filename { get; init; } = [];
+#pragma warning restore CA1819
 
 		/// <summary>
 		/// Gets a value indicating whether to push without prompting when all unpushed commits were authored by KtsuTools.