refactor: cleanup

Author: paul-fresquet

src/ByteSync.Client/ViewModels/Sessions/Inventories/InventoryAnalysisViewModel.cs

@@ -12,7 +12,7 @@ namespace ByteSync.ViewModels.Sessions.Inventories;
 
 public class InventoryAnalysisViewModel : ActivatableViewModelBase
 {
-    private readonly IInventoryService _inventoryService;
+    private readonly IInventoryService _inventoryService = null!;
     private readonly IThemeService _themeService = null!;
 
     public InventoryAnalysisViewModel()
@@ -82,25 +82,25 @@ private void HandleActivation(CompositeDisposable disposables)
                     case InventoryTaskStatus.Cancelled:
                     case InventoryTaskStatus.NotLaunched:
                         AnalysisIcon = "SolidXCircle";
-                        AnalysisIconBrush = _themeService?.GetBrush("MainSecondaryColor");
+                        AnalysisIconBrush = _themeService.GetBrush("MainSecondaryColor");
 
                         break;
                     case InventoryTaskStatus.Success:
                         AnalysisIcon = errors > 0 ? "RegularError" : "SolidCheckCircle";
                         AnalysisIconBrush = errors > 0
-                            ? _themeService?.GetBrush("MainSecondaryColor")
-                            : _themeService?.GetBrush("HomeCloudSynchronizationBackGround");
+                            ? _themeService.GetBrush("MainSecondaryColor")
+                            : _themeService.GetBrush("HomeCloudSynchronizationBackGround");
 
                         break;
                     case InventoryTaskStatus.Pending:
                     case InventoryTaskStatus.Running:
                         AnalysisIcon = "None";
-                        AnalysisIconBrush = _themeService?.GetBrush("HomeCloudSynchronizationBackGround");
+                        AnalysisIconBrush = _themeService.GetBrush("HomeCloudSynchronizationBackGround");
 
                         break;
                     default:
                         AnalysisIcon = "None";
-                        AnalysisIconBrush = _themeService?.GetBrush("HomeCloudSynchronizationBackGround");
+                        AnalysisIconBrush = _themeService.GetBrush("HomeCloudSynchronizationBackGround");
 
                         break;
                 }

src/ByteSync.Client/ViewModels/Sessions/Inventories/InventoryMainStatusViewModel.cs

@@ -1,9 +1,7 @@
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
-using Avalonia;
 using Avalonia.Media;
-using Avalonia.Styling;
 using ByteSync.Assets.Resources;
 using ByteSync.Business;
 using ByteSync.Business.Inventories;
@@ -33,13 +31,14 @@ public InventoryMainStatusViewModel()
     }
 
     public InventoryMainStatusViewModel(IInventoryService inventoryService, ISessionService sessionService,
-        ITimeTrackingCache timeTrackingCache, IDialogService dialogService, ILogger<InventoryMainStatusViewModel> logger,
-        IInventoryStatisticsService inventoryStatisticsService)
+        ITimeTrackingCache timeTrackingCache, IDialogService dialogService, IThemeService themeService,
+        IInventoryStatisticsService inventoryStatisticsService, ILogger<InventoryMainStatusViewModel> logger)
     {
         _inventoryService = inventoryService;
         _sessionService = sessionService;
         _timeTrackingCache = timeTrackingCache;
         _dialogService = dialogService;
+        _themeService = themeService;
         _logger = logger;
 
         AbortIventoryCommand = ReactiveCommand.CreateFromTask(AbortInventory);
@@ -162,7 +161,7 @@ public InventoryMainStatusViewModel(IInventoryService inventoryService, ISession
                 {
                     GlobalMainIcon = v.Icon;
                     GlobalMainStatusText = v.Text;
-                    GlobalMainIconBrush = GetBrushSafe(v.BrushKey);
+                    GlobalMainIconBrush = themeService.GetBrush(v.BrushKey);
                 })
                 .DisposeWith(disposables);
 
@@ -181,16 +180,6 @@ public InventoryMainStatusViewModel(IInventoryService inventoryService, ISession
         });
     }
 
-    // // Overload with theme service for color selection
-    // public InventoryMainStatusViewModel(IInventoryService inventoryService, ISessionService sessionService,
-    //     ITimeTrackingCache timeTrackingCache, IDialogService dialogService, ILogger<InventoryMainStatusViewModel> logger,
-    //     IInventoryStatisticsService inventoryStatisticsService, IThemeService themeService)
-    //     : this(inventoryService, sessionService, timeTrackingCache, dialogService, logger, inventoryStatisticsService)
-    // {
-    //     _themeService = themeService;
-    //     GlobalMainIconBrush = _themeService?.GetBrush("HomeCloudSynchronizationBackGround");
-    // }
-    
     private void HandleActivation(CompositeDisposable disposables)
     {
         _inventoryService.InventoryProcessData.GlobalMainStatus
@@ -275,26 +264,4 @@ private async Task AbortInventory()
             await _inventoryService.AbortInventory();
         }
     }
-    
-    private IBrush? GetBrushSafe(string resourceName)
-    {
-        var brush = _themeService?.GetBrush(resourceName);
-        
-        if (brush != null) return brush;
-        
-        var themeVariant = Application.Current?.RequestedThemeVariant ?? ThemeVariant.Default;
-        if (Application.Current?.Styles.TryGetResource(resourceName, themeVariant, out var res) == true)
-        {
-            if (res is IBrush b) return b;
-            if (res is Color c) return new SolidColorBrush(c);
-        }
-        
-        if (Application.Current?.Styles.TryGetResource(resourceName, ThemeVariant.Default, out var res2) == true)
-        {
-            if (res2 is IBrush b2) return b2;
-            if (res2 is Color c2) return new SolidColorBrush(c2);
-        }
-        
-        return null;
-    }
 }

src/ByteSync.Client/ViewModels/Sessions/Inventories/InventoryProcessViewModel.cs

@@ -8,25 +8,27 @@
 using ByteSync.Interfaces.Dialogs;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using Serilog;
 
 namespace ByteSync.ViewModels.Sessions.Inventories;
 
 public class InventoryProcessViewModel : ActivatableViewModelBase
 {
     private readonly IInventoryService _inventoryService;
     private readonly IDialogService _dialogService;
+    private readonly ILogger<InventoryProcessViewModel> _logger;
 
     public InventoryProcessViewModel()
     {
     }
 
     public InventoryProcessViewModel(InventoryMainStatusViewModel inventoryMainStatusViewModel,
         InventoryIdentificationViewModel inventoryIdentificationViewModel, InventoryAnalysisViewModel inventoryAnalysisViewModel,
-        InventoryBeforeStartViewModel inventoryBeforeStartViewModel, IInventoryService inventoryService, IDialogService dialogService)
+        InventoryBeforeStartViewModel inventoryBeforeStartViewModel, IInventoryService inventoryService, IDialogService dialogService,
+        ILogger<InventoryProcessViewModel> logger)
     {
         _inventoryService = inventoryService;
         _dialogService = dialogService;
+        _logger = logger;
 
         InventoryMainStatusViewModel = inventoryMainStatusViewModel;
         InventoryIdentificationViewModel = inventoryIdentificationViewModel;
@@ -48,46 +50,8 @@ private void HandleActivation(CompositeDisposable disposables)
             .DisposeWith(disposables);
     }
 
-    private IObservable<(InventoryMonitorData, InventoryTaskStatus)> SampledMonitorData
-    {
-        get
-        {
-            var source = InventoryProcessData.InventoryMonitorObservable.CombineLatest(InventoryProcessData.IdentificationStatus);
-            
-            Func<(InventoryMonitorData, InventoryTaskStatus), bool> canSkip =
-                tuple =>
-                {
-                    var inventoryMonitorData = tuple.Item1;
-                    var localInventoryPartStatus = tuple.Item2;
-                    
-                    return inventoryMonitorData.HasNonZeroProperty() &&
-                           localInventoryPartStatus.In(InventoryTaskStatus.Running);
-                };
-            
-            // Share the source so that it's not subscribed multiple times
-            var sharedSource = source.Publish().RefCount();
-            
-            // Sample the source observable every 0.52 seconds, but only for values that can be skipped
-            var sampled = sharedSource
-                .Where(canSkip)
-                .Sample(TimeSpan.FromSeconds(0.5));
-            
-            // Get the values from the shared source that can not be skipped
-            var notSkipped = sharedSource
-                .Where(value => !canSkip(value));
-            
-            // Merge the sampled and notSkipped sequences
-            var merged = sampled.Merge(notSkipped);
-            
-            return merged;
-        }
-    }
-    
     public extern bool HasLocalInventoryStarted { [ObservableAsProperty] get; }
 
-    [Reactive]
-    public InventoryMonitorData MonitorData { get; set; }
-    
     [Reactive]
     public InventoryProcessData InventoryProcessData { get; set; }
 
@@ -110,9 +74,9 @@ private async Task AbortInventory()
 
         if (result == MessageBoxResult.Yes)
         {
-            Log.Information("inventory aborted on user request");
+            _logger.LogInformation("inventory aborted on user request");
 
-            _inventoryService.InventoryProcessData?.RequestInventoryAbort();
+            _inventoryService.InventoryProcessData.RequestInventoryAbort();
 
             await _inventoryService.AbortInventory();
         }

tests/ByteSync.Client.Tests/ViewModels/Sessions/Inventories/InventoryMainStatusViewModelTests.cs

@@ -4,6 +4,7 @@
 using ByteSync.Business.Misc;
 using ByteSync.Business.Sessions;
 using ByteSync.Interfaces.Controls.Inventories;
+using ByteSync.Interfaces.Controls.Themes;
 using ByteSync.Interfaces.Controls.TimeTracking;
 using ByteSync.Interfaces.Dialogs;
 using ByteSync.Interfaces.Services.Sessions;
@@ -26,6 +27,7 @@ public class InventoryMainStatusViewModelTests
     private Mock<ISessionService> _sessionService = null!;
     private Mock<ITimeTrackingCache> _timeTrackingCache = null!;
     private Mock<IDialogService> _dialogService = null!;
+    private Mock<IThemeService> _themeService = null!;
     private Mock<ILogger<InventoryMainStatusViewModel>> _logger = null!;
 
     [SetUp]
@@ -40,6 +42,8 @@ public void Setup()
         _statsService = new Mock<IInventoryStatisticsService>();
         _statsService.SetupGet(x => x.Statistics).Returns(_statsSubject.AsObservable());
 
+        _themeService = new Mock<IThemeService>();
+        
         _sessionService = new Mock<ISessionService>();
         _sessionService.SetupGet(x => x.SessionId).Returns("test-session");
         _sessionStatusSubject = new Subject<SessionStatus>();
@@ -64,8 +68,9 @@ private InventoryMainStatusViewModel CreateVm()
             _sessionService.Object,
             _timeTrackingCache.Object,
             _dialogService.Object,
-            _logger.Object,
-            _statsService.Object);
+            _themeService.Object,
+            _statsService.Object,
+            _logger.Object);
         vm.Activator.Activate();
 
         return vm;