Merge pull request #663 from emoacht/develop

emoacht · web-flow · commit eadea848f3a6 · 2024-12-10T05:53:35.000+09:00
Develop
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,7 +1,7 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
 	 xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
 	 xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
-	<Package Name="Monitorian" Manufacturer="emoacht" Version="4.9.2"
+	<Package Name="Monitorian" Manufacturer="emoacht" Version="4.9.4"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<SummaryInformation Description="Installer for Monitorian"/>
 
diff --git a/Source/Monitorian.Core/AppControllerCore.cs b/Source/Monitorian.Core/AppControllerCore.cs
@@ -41,8 +41,6 @@ public class AppControllerCore
 	private readonly BrightnessWatcher _brightnessWatcher;
 	private readonly BrightnessConnector _brightnessConnector;
 
-	protected OperationRecorder Recorder { get; } = new();
-
 	public AppControllerCore(AppKeeper keeper, SettingsCore settings)
 	{
 		this._keeper = keeper ?? throw new ArgumentNullException(nameof(keeper));
@@ -95,14 +93,20 @@ public virtual async Task InitiateAsync()
 
 		_sessionWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(SessionWatcher), e));
 		_powerWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(PowerWatcher), e));
-		_displaySettingsWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(DisplaySettingsWatcher), e));
+		_displaySettingsWatcher.Subscribe((e) =>
+		{
+			if (!_powerWatcher.IsDisplayOff)
+			{
+				OnMonitorsChangeInferred(nameof(DisplaySettingsWatcher), e);
+			}
+		});
 
 		_displayInformationWatcher.Subscribe(async (deviceInstanceId, message) =>
 		{
 			if (!_sessionWatcher.IsLocked)
 			{
 				await UpdateMessageAsync(deviceInstanceId, message);
-				await Recorder.RecordAsync(message);
+				await OperationRecorder.RecordAsync(message);
 			}
 		});
 
@@ -113,7 +117,7 @@ public virtual async Task InitiateAsync()
 				if (!_sessionWatcher.IsLocked)
 					Update(instanceName, brightness);
 			},
-			async (message) => await Recorder.RecordAsync(message));
+			async (message) => await OperationRecorder.RecordAsync(message));
 
 			if (_brightnessConnector.IsEnabled)
 			{
@@ -122,7 +126,7 @@ await _brightnessConnector.InitiateAsync((brightness) =>
 					if (!_sessionWatcher.IsLocked)
 						Update(null, brightness);
 				},
-				async (message) => await Recorder.RecordAsync(message),
+				async (message) => await OperationRecorder.RecordAsync(message),
 				() => _current.Dispatcher.Invoke(() => _current.MainWindow.Visibility is Visibility.Visible));
 			}
 		}
@@ -207,7 +211,7 @@ protected virtual async void OnSettingsInitiated()
 			WindowPainter.AttachAccentColors();
 
 		if (Settings.MakesOperationLog)
-			await Recorder.EnableAsync("Initiated");
+			await OperationRecorder.EnableAsync("Initiated");
 	}
 
 	protected virtual async void OnSettingsChanged(object sender, PropertyChangedEventArgs e)
@@ -242,9 +246,9 @@ protected virtual async void OnSettingsChanged(object sender, PropertyChangedEve
 
 			case nameof(Settings.MakesOperationLog):
 				if (Settings.MakesOperationLog)
-					await Recorder.EnableAsync("Enabled");
+					await OperationRecorder.EnableAsync("Enabled");
 				else
-					Recorder.Disable();
+					OperationRecorder.Disable();
 
 				break;
 		}
@@ -254,7 +258,7 @@ protected virtual async void OnSettingsChanged(object sender, PropertyChangedEve
 
 	protected virtual async void OnMonitorsChangeInferred(object sender, ICountEventArgs e = null)
 	{
-		await Recorder.RecordAsync($"{nameof(OnMonitorsChangeInferred)} ({sender}{e?.Description})");
+		await OperationRecorder.RecordAsync($"{nameof(OnMonitorsChangeInferred)} ({sender}{e?.Description})");
 
 		await ProceedScanAsync(e);
 	}
@@ -269,7 +273,7 @@ protected virtual async Task ProceedScanAsync(ICountEventArgs e)
 
 	protected internal virtual async void OnMonitorAccessFailed(AccessResult result)
 	{
-		await Recorder.RecordAsync($"{nameof(OnMonitorAccessFailed)}" + Environment.NewLine
+		await OperationRecorder.RecordAsync($"{nameof(OnMonitorAccessFailed)}" + Environment.NewLine
 			+ $"Status: {result.Status}" + Environment.NewLine
 			+ $"Message: {result.Message}");
 	}
@@ -278,7 +282,7 @@ protected internal virtual async void OnMonitorsChangeFound()
 	{
 		if (Monitors.Any())
 		{
-			await Recorder.RecordAsync($"{nameof(OnMonitorsChangeFound)}");
+			await OperationRecorder.RecordAsync($"{nameof(OnMonitorsChangeFound)}");
 
 			_displaySettingsWatcher.RaiseDisplaySettingsChanged();
 		}
@@ -309,7 +313,7 @@ protected virtual async Task ScanAsync(TimeSpan interval)
 
 				var intervalTask = (interval > TimeSpan.Zero) ? Task.Delay(interval) : Task.CompletedTask;
 
-				Recorder.StartGroupRecord($"{nameof(ScanAsync)} [{DateTime.Now}]");
+				OperationRecorder.StartGroupRecord($"{nameof(ScanAsync)} [{DateTime.Now}]");
 
 				await Task.Run(async () =>
 				{
@@ -318,7 +322,7 @@ await Task.Run(async () =>
 
 					foreach (var item in await MonitorManager.EnumerateMonitorsAsync(TimeSpan.FromSeconds(12)))
 					{
-						Recorder.AddGroupRecordItem("Items", item.ToString());
+						OperationRecorder.AddGroupRecordItem("Items", item.ToString());
 
 						var oldMonitorExists = false;
 
@@ -390,8 +394,8 @@ await Task.Run(async () =>
 				foreach (var m in Monitors.Where(x => !x.IsControllable))
 					m.IsTarget = !controllableMonitorExists;
 
-				Recorder.AddGroupRecordItems(nameof(Monitors), Monitors.Select(x => x.ToString()));
-				await Recorder.EndGroupRecordAsync();
+				OperationRecorder.AddGroupRecordItems(nameof(Monitors), Monitors.Select(x => x.ToString()));
+				await OperationRecorder.EndGroupRecordAsync();
 
 				await intervalTask;
 			}
diff --git a/Source/Monitorian.Core/Models/OperationRecorder.cs b/Source/Monitorian.Core/Models/OperationRecorder.cs
@@ -8,27 +8,27 @@
 
 namespace Monitorian.Core.Models;
 
-public class OperationRecorder
+public static class OperationRecorder
 {
-	public bool IsEnabled { get; private set; }
+	public static bool IsEnabled { get; private set; }
 
-	public async Task EnableAsync(string message)
+	public static async Task EnableAsync(string message)
 	{
 		await Logger.PrepareOperationAsync();
 		await Logger.RecordOperationAsync(message);
 
 		IsEnabled = true;
 	}
 
-	public void Disable()
+	public static void Disable()
 	{
 		IsEnabled = false;
 
 		FinishLineRecord();
 		FinishGroupRecord();
 	}
 
-	public Task RecordAsync(string content)
+	public static Task RecordAsync(string content)
 	{
 		return IsEnabled
 			? Logger.RecordOperationAsync(content)
@@ -37,30 +37,30 @@ public Task RecordAsync(string content)
 
 	#region Line
 
-	private readonly Lazy<Throttle<string>> _record = new(() => new(
+	private static readonly Lazy<Throttle<string>> _record = new(() => new(
 		TimeSpan.FromSeconds(1),
 		async queue => await Logger.RecordOperationAsync(string.Join(Environment.NewLine, queue))));
 
-	private readonly Lazy<ConcurrentDictionary<string, List<string>>> _actionLines = new(() => new());
+	private static readonly Lazy<ConcurrentDictionary<string, List<string>>> _actionLines = new(() => new());
 
 	/// <summary>
 	/// Starts a record consisting of lines (concurrent).
 	/// </summary>
 	/// <param name="key">Unique key</param>
 	/// <param name="actionName">Action name</param>
-	public void StartLineRecord(string key, string actionName)
+	public static void StartLineRecord(string key, string actionName)
 	{
 		if (IsEnabled)
 			_actionLines.Value[key] = new List<string>([actionName]);
 	}
 
-	public void AddLineRecord(string key, string lineString)
+	public static void AddLineRecord(string key, string lineString)
 	{
 		if (IsEnabled && _actionLines.Value.TryGetValue(key, out var lines))
 			lines.Add(lineString);
 	}
 
-	public async Task EndLineRecordAsync(string key)
+	public static async Task EndLineRecordAsync(string key)
 	{
 		if (IsEnabled && _actionLines.Value.TryGetValue(key, out var lines))
 		{
@@ -69,7 +69,7 @@ public async Task EndLineRecordAsync(string key)
 		}
 	}
 
-	private void FinishLineRecord()
+	private static void FinishLineRecord()
 	{
 		_actionLines.Value.Clear();
 	}
@@ -78,32 +78,32 @@ private void FinishLineRecord()
 
 	#region Group
 
-	private string _actionName;
-	private readonly Lazy<List<(string groupName, StringWrapper item)>> _actionGroups = new(() => new());
+	private static string _actionName;
+	private static readonly Lazy<List<(string groupName, StringWrapper item)>> _actionGroups = new(() => new());
 
 	/// <summary>
 	/// Starts a record consisting of groups of lines (non-concurrent).
 	/// </summary>
 	/// <param name="actionName">Action name</param>
-	public void StartGroupRecord(string actionName)
+	public static void StartGroupRecord(string actionName)
 	{
 		if (IsEnabled)
-			this._actionName = actionName;
+			_actionName = actionName;
 	}
 
-	public void AddGroupRecordItem(string groupName, string itemString)
+	public static void AddGroupRecordItem(string groupName, string itemString)
 	{
 		if (IsEnabled)
 			_actionGroups.Value.Add((groupName, new StringWrapper(itemString)));
 	}
 
-	public void AddGroupRecordItems(string groupName, IEnumerable<string> itemStrings)
+	public static void AddGroupRecordItems(string groupName, IEnumerable<string> itemStrings)
 	{
 		if (IsEnabled)
 			_actionGroups.Value.AddRange(itemStrings.Select(x => (groupName, new StringWrapper(x))));
 	}
 
-	public async Task EndGroupRecordAsync()
+	public static async Task EndGroupRecordAsync()
 	{
 		if (IsEnabled)
 		{
@@ -114,7 +114,7 @@ public async Task EndGroupRecordAsync()
 		}
 	}
 
-	private void FinishGroupRecord()
+	private static void FinishGroupRecord()
 	{
 		_actionName = null;
 		_actionGroups.Value.Clear();
diff --git a/Source/Monitorian.Core/Models/Watcher/PowerWatcher.cs b/Source/Monitorian.Core/Models/Watcher/PowerWatcher.cs
@@ -77,16 +77,22 @@ private void OnPowerModeChanged(object sender, PowerModeChangedEventArgs e)
 		}
 	}
 
-	private void OnDisplayStateChanged(DisplayStates state)
+	public bool IsDisplayOff { get; private set; }
+
+	private async void OnDisplayStateChanged(DisplayStates state)
 	{
+		await OperationRecorder.RecordAsync($"Display {state}");
+
 		switch (state)
 		{
 			case DisplayStates.On:
 			case DisplayStates.Dimmed:
+				IsDisplayOff = false;
 				RaiseDisplayStateChanged(state, 0);
 				_stateWatcher.TimerStart(state);
 				break;
 			case DisplayStates.Off:
+				IsDisplayOff = true;
 				_stateWatcher.TimerStop();
 				RaiseDisplayStateChanged(state, 0);
 				break;
diff --git a/Source/Monitorian.Core/Properties/AssemblyInfo.cs b/Source/Monitorian.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.9.2.0")]
-[assembly: AssemblyFileVersion("4.9.2.0")]
+[assembly: AssemblyVersion("4.9.4.0")]
+[assembly: AssemblyFileVersion("4.9.4.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test
diff --git a/Source/Monitorian.Core/Views/MainWindow.xaml b/Source/Monitorian.Core/Views/MainWindow.xaml
@@ -673,7 +673,7 @@
 
 							<!-- Brightness -->
 							<controls:CompoundSlider Grid.Column="1"
-													 Margin="12,0,4,0" VerticalAlignment="Center"
+													 Margin="12,0,4,0" VerticalAlignment="Stretch"
 													 Style="{StaticResource MainSliderHorizontal}"
 													 Minimum="0" Maximum="100"
 													 SmallChange="1"
@@ -721,7 +721,7 @@
 							<!-- Contrast -->
 							<controls:EnhancedSlider Grid.Column="4"
 													 x:Name="ContrastSlider"
-													 Width="100" Margin="8,0,4,0" VerticalAlignment="Center"
+													 Width="100" Margin="8,0,4,0" VerticalAlignment="Stretch"
 													 Style="{StaticResource SubSliderHorizontal}"
 													 Minimum="0" Maximum="100"
 													 SmallChange="1"
diff --git a/Source/Monitorian/Properties/AssemblyInfo.cs b/Source/Monitorian/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.9.2.0")]
-[assembly: AssemblyFileVersion("4.9.2.0")]
+[assembly: AssemblyVersion("4.9.4.0")]
+[assembly: AssemblyFileVersion("4.9.4.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/docs/TEMPLATE.md b/docs/TEMPLATE.md
@@ -17,3 +17,12 @@ Probe.log & Operation.log
 ```
 Could you read [Contributing Guidelines](https://github.com/emoacht/Monitorian/blob/9aeb4238af22c60ccc03051f144edd1a5ee9acdb/CONTRIBUTING.md) and post __probe.log__ and __operation.log__? How to produce these logs is explained in [Reporting](https://github.com/emoacht/Monitorian#reporting) section of readme.
 ```
+
+Details
+
+```
+<details>
+  <summary>caption</summary>
+
+</details>
+```

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ public class AppControllerCore`
`41`	`41`	`private readonly BrightnessWatcher _brightnessWatcher;`
`42`	`42`	`private readonly BrightnessConnector _brightnessConnector;`
`43`	`43`
`44`		`- protected OperationRecorder Recorder { get; } = new();`
`45`		`-`
`46`	`44`	`public AppControllerCore(AppKeeper keeper, SettingsCore settings)`
`47`	`45`	`{`
`48`	`46`	`this._keeper = keeper ?? throw new ArgumentNullException(nameof(keeper));`
`@@ -95,14 +93,20 @@ public virtual async Task InitiateAsync()`
`95`	`93`
`96`	`94`	`_sessionWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(SessionWatcher), e));`
`97`	`95`	`_powerWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(PowerWatcher), e));`
`98`		`- _displaySettingsWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(DisplaySettingsWatcher), e));`
	`96`	`+ _displaySettingsWatcher.Subscribe((e) =>`
	`97`	`+ {`
	`98`	`+ if (!_powerWatcher.IsDisplayOff)`
	`99`	`+ {`
	`100`	`+ OnMonitorsChangeInferred(nameof(DisplaySettingsWatcher), e);`
	`101`	`+ }`
	`102`	`+ });`
`99`	`103`
`100`	`104`	`_displayInformationWatcher.Subscribe(async (deviceInstanceId, message) =>`
`101`	`105`	`{`
`102`	`106`	`if (!_sessionWatcher.IsLocked)`
`103`	`107`	`{`
`104`	`108`	`await UpdateMessageAsync(deviceInstanceId, message);`
`105`		`- await Recorder.RecordAsync(message);`
	`109`	`+ await OperationRecorder.RecordAsync(message);`
`106`	`110`	`}`
`107`	`111`	`});`
`108`	`112`
`@@ -113,7 +117,7 @@ public virtual async Task InitiateAsync()`
`113`	`117`	`if (!_sessionWatcher.IsLocked)`
`114`	`118`	`Update(instanceName, brightness);`
`115`	`119`	`},`
`116`		`- async (message) => await Recorder.RecordAsync(message));`
	`120`	`+ async (message) => await OperationRecorder.RecordAsync(message));`
`117`	`121`
`118`	`122`	`if (_brightnessConnector.IsEnabled)`
`119`	`123`	`{`
`@@ -122,7 +126,7 @@ await _brightnessConnector.InitiateAsync((brightness) =>`
`122`	`126`	`if (!_sessionWatcher.IsLocked)`
`123`	`127`	`Update(null, brightness);`
`124`	`128`	`},`
`125`		`- async (message) => await Recorder.RecordAsync(message),`
	`129`	`+ async (message) => await OperationRecorder.RecordAsync(message),`
`126`	`130`	`() => _current.Dispatcher.Invoke(() => _current.MainWindow.Visibility is Visibility.Visible));`
`127`	`131`	`}`
`128`	`132`	`}`
`@@ -207,7 +211,7 @@ protected virtual async void OnSettingsInitiated()`
`207`	`211`	`WindowPainter.AttachAccentColors();`
`208`	`212`
`209`	`213`	`if (Settings.MakesOperationLog)`
`210`		`- await Recorder.EnableAsync("Initiated");`
	`214`	`+ await OperationRecorder.EnableAsync("Initiated");`
`211`	`215`	`}`
`212`	`216`
`213`	`217`	`protected virtual async void OnSettingsChanged(object sender, PropertyChangedEventArgs e)`
`@@ -242,9 +246,9 @@ protected virtual async void OnSettingsChanged(object sender, PropertyChangedEve`
`242`	`246`
`243`	`247`	`case nameof(Settings.MakesOperationLog):`
`244`	`248`	`if (Settings.MakesOperationLog)`
`245`		`- await Recorder.EnableAsync("Enabled");`
	`249`	`+ await OperationRecorder.EnableAsync("Enabled");`
`246`	`250`	`else`
`247`		`- Recorder.Disable();`
	`251`	`+ OperationRecorder.Disable();`
`248`	`252`
`249`	`253`	`break;`
`250`	`254`	`}`
`@@ -254,7 +258,7 @@ protected virtual async void OnSettingsChanged(object sender, PropertyChangedEve`
`254`	`258`
`255`	`259`	`protected virtual async void OnMonitorsChangeInferred(object sender, ICountEventArgs e = null)`
`256`	`260`	`{`
`257`		`- await Recorder.RecordAsync($"{nameof(OnMonitorsChangeInferred)} ({sender}{e?.Description})");`
	`261`	`+ await OperationRecorder.RecordAsync($"{nameof(OnMonitorsChangeInferred)} ({sender}{e?.Description})");`
`258`	`262`
`259`	`263`	`await ProceedScanAsync(e);`
`260`	`264`	`}`
`@@ -269,7 +273,7 @@ protected virtual async Task ProceedScanAsync(ICountEventArgs e)`
`269`	`273`
`270`	`274`	`protected internal virtual async void OnMonitorAccessFailed(AccessResult result)`
`271`	`275`	`{`
`272`		`- await Recorder.RecordAsync($"{nameof(OnMonitorAccessFailed)}" + Environment.NewLine`
	`276`	`+ await OperationRecorder.RecordAsync($"{nameof(OnMonitorAccessFailed)}" + Environment.NewLine`
`273`	`277`	`+ $"Status: {result.Status}" + Environment.NewLine`
`274`	`278`	`+ $"Message: {result.Message}");`
`275`	`279`	`}`
`@@ -278,7 +282,7 @@ protected internal virtual async void OnMonitorsChangeFound()`
`278`	`282`	`{`
`279`	`283`	`if (Monitors.Any())`
`280`	`284`	`{`
`281`		`- await Recorder.RecordAsync($"{nameof(OnMonitorsChangeFound)}");`
	`285`	`+ await OperationRecorder.RecordAsync($"{nameof(OnMonitorsChangeFound)}");`
`282`	`286`
`283`	`287`	`_displaySettingsWatcher.RaiseDisplaySettingsChanged();`
`284`	`288`	`}`
`@@ -309,7 +313,7 @@ protected virtual async Task ScanAsync(TimeSpan interval)`
`309`	`313`
`310`	`314`	`var intervalTask = (interval > TimeSpan.Zero) ? Task.Delay(interval) : Task.CompletedTask;`
`311`	`315`
`312`		`- Recorder.StartGroupRecord($"{nameof(ScanAsync)} [{DateTime.Now}]");`
	`316`	`+ OperationRecorder.StartGroupRecord($"{nameof(ScanAsync)} [{DateTime.Now}]");`
`313`	`317`
`314`	`318`	`await Task.Run(async () =>`
`315`	`319`	`{`
`@@ -318,7 +322,7 @@ await Task.Run(async () =>`
`318`	`322`
`319`	`323`	`foreach (var item in await MonitorManager.EnumerateMonitorsAsync(TimeSpan.FromSeconds(12)))`
`320`	`324`	`{`
`321`		`- Recorder.AddGroupRecordItem("Items", item.ToString());`
	`325`	`+ OperationRecorder.AddGroupRecordItem("Items", item.ToString());`
`322`	`326`
`323`	`327`	`var oldMonitorExists = false;`
`324`	`328`
`@@ -390,8 +394,8 @@ await Task.Run(async () =>`
`390`	`394`	`foreach (var m in Monitors.Where(x => !x.IsControllable))`
`391`	`395`	`m.IsTarget = !controllableMonitorExists;`
`392`	`396`
`393`		`- Recorder.AddGroupRecordItems(nameof(Monitors), Monitors.Select(x => x.ToString()));`
`394`		`- await Recorder.EndGroupRecordAsync();`
	`397`	`+ OperationRecorder.AddGroupRecordItems(nameof(Monitors), Monitors.Select(x => x.ToString()));`
	`398`	`+ await OperationRecorder.EndGroupRecordAsync();`
`395`	`399`
`396`	`400`	`await intervalTask;`
`397`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,27 +8,27 @@`
`8`	`8`
`9`	`9`	`namespace Monitorian.Core.Models;`
`10`	`10`
`11`		`-public class OperationRecorder`
	`11`	`+public static class OperationRecorder`
`12`	`12`	`{`
`13`		`- public bool IsEnabled { get; private set; }`
	`13`	`+ public static bool IsEnabled { get; private set; }`
`14`	`14`
`15`		`- public async Task EnableAsync(string message)`
	`15`	`+ public static async Task EnableAsync(string message)`
`16`	`16`	`{`
`17`	`17`	`await Logger.PrepareOperationAsync();`
`18`	`18`	`await Logger.RecordOperationAsync(message);`
`19`	`19`
`20`	`20`	`IsEnabled = true;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public void Disable()`
	`23`	`+ public static void Disable()`
`24`	`24`	`{`
`25`	`25`	`IsEnabled = false;`
`26`	`26`
`27`	`27`	`FinishLineRecord();`
`28`	`28`	`FinishGroupRecord();`
`29`	`29`	`}`
`30`	`30`
`31`		`- public Task RecordAsync(string content)`
	`31`	`+ public static Task RecordAsync(string content)`
`32`	`32`	`{`
`33`	`33`	`return IsEnabled`
`34`	`34`	`? Logger.RecordOperationAsync(content)`
`@@ -37,30 +37,30 @@ public Task RecordAsync(string content)`
`37`	`37`
`38`	`38`	`#region Line`
`39`	`39`
`40`		`- private readonly Lazy<Throttle<string>> _record = new(() => new(`
	`40`	`+ private static readonly Lazy<Throttle<string>> _record = new(() => new(`
`41`	`41`	`TimeSpan.FromSeconds(1),`
`42`	`42`	`async queue => await Logger.RecordOperationAsync(string.Join(Environment.NewLine, queue))));`
`43`	`43`
`44`		`- private readonly Lazy<ConcurrentDictionary<string, List<string>>> _actionLines = new(() => new());`
	`44`	`+ private static readonly Lazy<ConcurrentDictionary<string, List<string>>> _actionLines = new(() => new());`
`45`	`45`
`46`	`46`	`/// <summary>`
`47`	`47`	`/// Starts a record consisting of lines (concurrent).`
`48`	`48`	`/// </summary>`
`49`	`49`	`/// <param name="key">Unique key</param>`
`50`	`50`	`/// <param name="actionName">Action name</param>`
`51`		`- public void StartLineRecord(string key, string actionName)`
	`51`	`+ public static void StartLineRecord(string key, string actionName)`
`52`	`52`	`{`
`53`	`53`	`if (IsEnabled)`
`54`	`54`	`_actionLines.Value[key] = new List<string>([actionName]);`
`55`	`55`	`}`
`56`	`56`
`57`		`- public void AddLineRecord(string key, string lineString)`
	`57`	`+ public static void AddLineRecord(string key, string lineString)`
`58`	`58`	`{`
`59`	`59`	`if (IsEnabled && _actionLines.Value.TryGetValue(key, out var lines))`
`60`	`60`	`lines.Add(lineString);`
`61`	`61`	`}`
`62`	`62`
`63`		`- public async Task EndLineRecordAsync(string key)`
	`63`	`+ public static async Task EndLineRecordAsync(string key)`
`64`	`64`	`{`
`65`	`65`	`if (IsEnabled && _actionLines.Value.TryGetValue(key, out var lines))`
`66`	`66`	`{`
`@@ -69,7 +69,7 @@ public async Task EndLineRecordAsync(string key)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- private void FinishLineRecord()`
	`72`	`+ private static void FinishLineRecord()`
`73`	`73`	`{`
`74`	`74`	`_actionLines.Value.Clear();`
`75`	`75`	`}`
`@@ -78,32 +78,32 @@ private void FinishLineRecord()`
`78`	`78`
`79`	`79`	`#region Group`
`80`	`80`
`81`		`- private string _actionName;`
`82`		`- private readonly Lazy<List<(string groupName, StringWrapper item)>> _actionGroups = new(() => new());`
	`81`	`+ private static string _actionName;`
	`82`	`+ private static readonly Lazy<List<(string groupName, StringWrapper item)>> _actionGroups = new(() => new());`
`83`	`83`
`84`	`84`	`/// <summary>`
`85`	`85`	`/// Starts a record consisting of groups of lines (non-concurrent).`
`86`	`86`	`/// </summary>`
`87`	`87`	`/// <param name="actionName">Action name</param>`
`88`		`- public void StartGroupRecord(string actionName)`
	`88`	`+ public static void StartGroupRecord(string actionName)`
`89`	`89`	`{`
`90`	`90`	`if (IsEnabled)`
`91`		`- this._actionName = actionName;`
	`91`	`+ _actionName = actionName;`
`92`	`92`	`}`
`93`	`93`
`94`		`- public void AddGroupRecordItem(string groupName, string itemString)`
	`94`	`+ public static void AddGroupRecordItem(string groupName, string itemString)`
`95`	`95`	`{`
`96`	`96`	`if (IsEnabled)`
`97`	`97`	`_actionGroups.Value.Add((groupName, new StringWrapper(itemString)));`
`98`	`98`	`}`
`99`	`99`
`100`		`- public void AddGroupRecordItems(string groupName, IEnumerable<string> itemStrings)`
	`100`	`+ public static void AddGroupRecordItems(string groupName, IEnumerable<string> itemStrings)`
`101`	`101`	`{`
`102`	`102`	`if (IsEnabled)`
`103`	`103`	`_actionGroups.Value.AddRange(itemStrings.Select(x => (groupName, new StringWrapper(x))));`
`104`	`104`	`}`
`105`	`105`
`106`		`- public async Task EndGroupRecordAsync()`
	`106`	`+ public static async Task EndGroupRecordAsync()`
`107`	`107`	`{`
`108`	`108`	`if (IsEnabled)`
`109`	`109`	`{`
`@@ -114,7 +114,7 @@ public async Task EndGroupRecordAsync()`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`- private void FinishGroupRecord()`
	`117`	`+ private static void FinishGroupRecord()`
`118`	`118`	`{`
`119`	`119`	`_actionName = null;`
`120`	`120`	`_actionGroups.Value.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -77,16 +77,22 @@ private void OnPowerModeChanged(object sender, PowerModeChangedEventArgs e)`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- private void OnDisplayStateChanged(DisplayStates state)`
	`80`	`+ public bool IsDisplayOff { get; private set; }`
	`81`	`+`
	`82`	`+ private async void OnDisplayStateChanged(DisplayStates state)`
`81`	`83`	`{`
	`84`	`+ await OperationRecorder.RecordAsync($"Display {state}");`
	`85`	`+`
`82`	`86`	`switch (state)`
`83`	`87`	`{`
`84`	`88`	`case DisplayStates.On:`
`85`	`89`	`case DisplayStates.Dimmed:`
	`90`	`+ IsDisplayOff = false;`
`86`	`91`	`RaiseDisplayStateChanged(state, 0);`
`87`	`92`	`_stateWatcher.TimerStart(state);`
`88`	`93`	`break;`
`89`	`94`	`case DisplayStates.Off:`
	`95`	`+ IsDisplayOff = true;`
`90`	`96`	`_stateWatcher.TimerStop();`
`91`	`97`	`RaiseDisplayStateChanged(state, 0);`
`92`	`98`	`break;`