Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

fix: improve performance Bloatware Service and add Timer cleanup in Optimization State

fatDuckf1084d112d91
diff --git a/optimizerDuck/Domain/UI/OptimizationState.cs b/optimizerDuck/Domain/UI/OptimizationState.cs
index d75210a..31e8a49 100644
--- a/optimizerDuck/Domain/UI/OptimizationState.cs
+++ b/optimizerDuck/Domain/UI/OptimizationState.cs
@@ -1,5 +1,4 @@
-using System.Windows;
-using System.Windows.Threading;
+using System.Windows.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using optimizerDuck.Resources.Languages;
@@ -11,8 +10,9 @@ namespace optimizerDuck.Domain.UI;
/// </summary>
public partial class OptimizationState : ObservableObject
{
- private static readonly DispatcherTimer _globalTimer;
+ private static DispatcherTimer? _globalTimer;
private static readonly List<WeakReference<OptimizationState>> _instances = [];
+ private static readonly object _lock = new();
private int _lastDisplayedSeconds = -1;
@@ -40,34 +40,54 @@ public partial class OptimizationState : ObservableObject
[ObservableProperty]
private OptimizationRisk risk;
- static OptimizationState()
- {
- _globalTimer = new DispatcherTimer(
- TimeSpan.FromSeconds(1),
- DispatcherPriority.Render,
- (s, e) => UpdateAllRelativeTimes(),
- Application.Current?.Dispatcher ?? Dispatcher.CurrentDispatcher
- );
- _globalTimer.Start();
- }
-
public OptimizationState()
{
- lock (_instances)
+ EnsureTimerRunning();
+ lock (_lock)
{
_instances.Add(new WeakReference<OptimizationState>(this));
}
}
+ private static void EnsureTimerRunning()
+ {
+ if (_globalTimer != null)
+ return;
+
+ // Defer timer creation to avoid accessing dispatcher during static init
+ _ = System.Windows.Application.Current?.Dispatcher.InvokeAsync(() =>
+ {
+ lock (_lock)
+ {
+ if (_globalTimer != null)
+ return;
+ _globalTimer = new DispatcherTimer(
+ TimeSpan.FromSeconds(1),
+ DispatcherPriority.Render,
+ (s, e) => UpdateAllRelativeTimes(),
+ System.Windows.Application.Current.Dispatcher
+ );
+ _globalTimer.Start();
+ }
+ });
+ }
+
private static void UpdateAllRelativeTimes()
{
- lock (_instances)
+ lock (_lock)
{
for (var i = _instances.Count - 1; i >= 0; i--)
if (_instances[i].TryGetTarget(out var instance))
instance.UpdateRelativeTime();
else
_instances.RemoveAt(i);
+
+ // Stop the timer when no live instances remain
+ if (_instances.Count == 0 && _globalTimer != null)
+ {
+ _globalTimer.Stop();
+ _globalTimer = null;
+ }
}
}
diff --git a/optimizerDuck/Services/UI/BloatwareService.cs b/optimizerDuck/Services/UI/BloatwareService.cs
index a61338b..83ba48e 100644
--- a/optimizerDuck/Services/UI/BloatwareService.cs
+++ b/optimizerDuck/Services/UI/BloatwareService.cs
@@ -383,49 +383,24 @@ public class BloatwareService(
var baseNameWithoutQualifiers = StripKnownQualifiers(baseResourceName);
var preferredLogicalSize = GuessLogicalBaseSize(baseNameWithoutQualifiers);
- var best = Directory
- .EnumerateFiles(candidateDirectory, "*.*", SearchOption.TopDirectoryOnly)
- .Where(path =>
- SupportedImageExtensions.Contains(
- Path.GetExtension(path),
- StringComparer.OrdinalIgnoreCase
- )
- )
- .Where(path =>
- {
- var fileName = Path.GetFileNameWithoutExtension(path);
- var stripped = StripKnownQualifiers(fileName);
- return stripped.Equals(
- baseNameWithoutQualifiers,
- StringComparison.OrdinalIgnoreCase
- );
- })
- .Select(path => new LogoVariant(path, preferredLogicalSize, includeThemeSpecific))
- .MaxBy(v => v.SortScore);
+ var best = FindBestLogoVariant(
+ candidateDirectory,
+ baseNameWithoutQualifiers,
+ preferredLogicalSize,
+ includeThemeSpecific,
+ SearchOption.TopDirectoryOnly
+ );
if (best != null)
return best.Path;
- return Directory
- .EnumerateFiles(candidateDirectory, "*.*", SearchOption.AllDirectories)
- .Where(path =>
- SupportedImageExtensions.Contains(
- Path.GetExtension(path),
- StringComparer.OrdinalIgnoreCase
- )
- )
- .Where(path =>
- {
- var fileName = Path.GetFileNameWithoutExtension(path);
- var stripped = StripKnownQualifiers(fileName);
- return stripped.Equals(
- baseNameWithoutQualifiers,
- StringComparison.OrdinalIgnoreCase
- );
- })
- .Select(path => new LogoVariant(path, preferredLogicalSize, includeThemeSpecific))
- .MaxBy(v => v.SortScore)
- ?.Path;
+ return FindBestLogoVariant(
+ candidateDirectory,
+ baseNameWithoutQualifiers,
+ preferredLogicalSize,
+ includeThemeSpecific,
+ SearchOption.AllDirectories
+ )?.Path;
}
private static string StripKnownQualifiers(string fileNameWithoutExtension)
@@ -549,4 +524,33 @@ public class BloatwareService(
if (!string.IsNullOrWhiteSpace(val))
list.Add(val);
}
+
+ private static LogoVariant? FindBestLogoVariant(
+ string directory,
+ string baseNameWithoutQualifiers,
+ int preferredLogicalSize,
+ bool includeThemeSpecific,
+ SearchOption searchOption
+ )
+ {
+ return Directory
+ .EnumerateFiles(directory, "*.*", searchOption)
+ .Where(path =>
+ SupportedImageExtensions.Contains(
+ Path.GetExtension(path),
+ StringComparer.OrdinalIgnoreCase
+ )
+ )
+ .Where(path =>
+ {
+ var fileName = Path.GetFileNameWithoutExtension(path);
+ var stripped = StripKnownQualifiers(fileName);
+ return stripped.Equals(
+ baseNameWithoutQualifiers,
+ StringComparison.OrdinalIgnoreCase
+ );
+ })
+ .Select(path => new LogoVariant(path, preferredLogicalSize, includeThemeSpecific))
+ .MaxBy(v => v.SortScore);
+ }
}