From 31d6fc8197e067bf1f4a07216f8d8b89eb391375 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Wed, 13 Jul 2022 19:03:52 -0600 Subject: [PATCH] Refactor --- .../LibationWinForms/AvaloniaUI/App.axaml.cs | 1 - .../AvaloniaUI/ViewModels/ProcessBook2.cs | 2 -- .../ViewModels/ProcessQueueViewModel.cs | 12 +------ .../ViewModels/ProductsDisplayViewModel.cs | 2 -- .../MainWindow.BackupCounts.axaml.cs | 5 +-- .../MainWindow/MainWindow.Export.axaml.cs | 4 --- .../MainWindow/MainWindow.Filter.axaml.cs | 6 +--- .../MainWindow/MainWindow.Liberate.axaml.cs | 5 +-- .../MainWindow.ProcessQueue.axaml.cs | 6 +--- .../MainWindow.QuickFilters.axaml.cs | 3 -- .../MainWindow.RemoveBooks.axaml.cs | 2 +- .../MainWindow/MainWindow.ScanAuto.axaml.cs | 3 -- .../MainWindow/MainWindow.ScanManual.axaml.cs | 1 - .../MainWindow.ScanNotification.axaml.cs | 4 --- .../MainWindow/MainWindow.Settings.axaml.cs | 6 +--- .../MainWindow.VisibleBooks.axaml.cs | 3 -- .../MainWindow/MainWindow._NoUI.axaml.cs | 6 +--- .../Views/MainWindow/MainWindow.axaml.cs | 6 ---- .../Views/ProcessQueueControl2.axaml.cs | 31 ++----------------- .../ProductsDisplay2.Buttons.xaml.cs | 1 - 20 files changed, 10 insertions(+), 99 deletions(-) diff --git a/Source/LibationWinForms/AvaloniaUI/App.axaml.cs b/Source/LibationWinForms/AvaloniaUI/App.axaml.cs index c38a0ef0..0c1f1c19 100644 --- a/Source/LibationWinForms/AvaloniaUI/App.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/App.axaml.cs @@ -14,7 +14,6 @@ namespace LibationWinForms.AvaloniaUI public static IBrush ProcessQueueBookDefaultBrush { get; private set; } public static IBrush SeriesEntryGridBackgroundBrush { get; private set; } - public override void Initialize() { AvaloniaXamlLoader.Load(this); diff --git a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs index 9fdf74c2..4e4e9290 100644 --- a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs +++ b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBook2.cs @@ -84,7 +84,6 @@ namespace LibationWinForms.AvaloniaUI.ViewModels #endregion - private TimeSpan TimeRemaining { set { ETA = $"ETA: {value:mm\\:ss}"; } } private Processable CurrentProcessable => _currentProcessable ??= Processes.Dequeue().Invoke(); private Processable NextProcessable() => _currentProcessable = null; @@ -109,7 +108,6 @@ namespace LibationWinForms.AvaloniaUI.ViewModels // Mutable property. Set the field so PropertyChanged isn't fired. using var ms = new System.IO.MemoryStream(picture); _cover = new Bitmap(ms); - } private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e) diff --git a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs index ffff1d8e..271b76ad 100644 --- a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs +++ b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs @@ -12,15 +12,9 @@ namespace LibationWinForms.AvaloniaUI.ViewModels public class ProcessQueueViewModel : ViewModelBase, ProcessQueue.ILogForm { public ObservableCollection LogEntries { get; } = new(); - private TrackedQueue2 _items = new(); - public TrackedQueue2 Items - { - get => _items; - set => this.RaiseAndSetIfChanged(ref _items, value); - } + public TrackedQueue2 Items { get; } = new(); private TrackedQueue2 Queue => Items; - public ProcessBook2 SelectedItem { get; set; } public Task QueueRunner { get; private set; } public bool Running => !QueueRunner?.IsCompleted ?? false; @@ -42,15 +36,11 @@ namespace LibationWinForms.AvaloniaUI.ViewModels public int ErrorCount { get => _errorCount; private set { this.RaiseAndSetIfChanged(ref _errorCount, value); this.RaisePropertyChanged(nameof(AnyErrors)); } } public string RunningTime { get => _runningTime; set { this.RaiseAndSetIfChanged(ref _runningTime, value); } } public bool ProgressBarVisible { get => _progressBarVisible; set { this.RaiseAndSetIfChanged(ref _progressBarVisible, value); } } - public bool AnyCompleted => CompletedCount > 0; public bool AnyQueued => QueuedCount > 0; public bool AnyErrors => ErrorCount > 0; - public double Progress => 100d * Queue.Completed.Count / Queue.Count; - - private void Queue_CompletedCountChanged(object sender, int e) { int errCount = Queue.Completed.Count(p => p.Result is ProcessBookResult.FailedAbort or ProcessBookResult.FailedSkip or ProcessBookResult.FailedRetry or ProcessBookResult.ValidationFail); diff --git a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs index de7dfb21..0eb04002 100644 --- a/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs +++ b/Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs @@ -1,9 +1,7 @@ -using ApplicationServices; using Avalonia.Collections; using DataLayer; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Globalization; using System.Linq; using System.Text; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.BackupCounts.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.BackupCounts.axaml.cs index ace398d6..4d2cbb42 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.BackupCounts.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.BackupCounts.axaml.cs @@ -1,15 +1,12 @@ using ApplicationServices; -using Avalonia.Controls; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Avalonia.Threading; using Dinah.Core; namespace LibationWinForms.AvaloniaUI.Views { + //DONE public partial class MainWindow { private System.ComponentModel.BackgroundWorker updateCountsBw = new(); diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs index be054276..445ba0cd 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Export.axaml.cs @@ -1,10 +1,6 @@ using ApplicationServices; -using Avalonia.Controls; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs index e099d99b..cb97905f 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Filter.axaml.cs @@ -1,11 +1,7 @@ -using Avalonia.Controls; -using Avalonia.Input; +using Avalonia.Input; using LibationWinForms.Dialogs; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs index c69c275b..a9da48d6 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Liberate.axaml.cs @@ -1,9 +1,6 @@ -using Avalonia.Controls; -using DataLayer; +using DataLayer; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs index 132f39e2..5d166aba 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ProcessQueue.axaml.cs @@ -1,12 +1,8 @@ -using Avalonia.Controls; -using DataLayer; +using DataLayer; using Dinah.Core; using LibationFileManager; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs index 58a725d0..b0e2483e 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.QuickFilters.axaml.cs @@ -2,10 +2,7 @@ using LibationFileManager; using LibationWinForms.Dialogs; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs index e078ad25..56521f24 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.RemoveBooks.axaml.cs @@ -5,7 +5,7 @@ using System.Linq; namespace LibationWinForms.AvaloniaUI.Views { - //WORKING + //DONE public partial class MainWindow { private void Configure_RemoveBooks() diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanAuto.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanAuto.axaml.cs index d325a734..b2af2d9c 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanAuto.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanAuto.axaml.cs @@ -1,13 +1,10 @@ using ApplicationServices; using AudibleUtilities; -using Avalonia.Controls; using Dinah.Core; using LibationFileManager; using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs index 47efab3d..719b7e1a 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanManual.axaml.cs @@ -6,7 +6,6 @@ using LibationWinForms.Dialogs; using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanNotification.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanNotification.axaml.cs index a3594d47..4ace3e7c 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanNotification.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.ScanNotification.axaml.cs @@ -1,10 +1,6 @@ using ApplicationServices; -using Avalonia.Controls; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs index 7957676e..cc84bbe8 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.Settings.axaml.cs @@ -1,10 +1,6 @@ -using Avalonia.Controls; -using LibationWinForms.Dialogs; +using LibationWinForms.Dialogs; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs index 8b45239b..98896a42 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.VisibleBooks.axaml.cs @@ -1,12 +1,9 @@ using ApplicationServices; -using Avalonia.Controls; using Avalonia.Threading; using DataLayer; using LibationWinForms.Dialogs; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow._NoUI.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow._NoUI.axaml.cs index 6ec36db2..2da1d8df 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow._NoUI.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow._NoUI.axaml.cs @@ -1,11 +1,7 @@ -using Avalonia.Controls; -using Dinah.Core.Drawing; +using Dinah.Core.Drawing; using LibationFileManager; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace LibationWinForms.AvaloniaUI.Views { diff --git a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs index 22d7b4e8..17ad94c5 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/MainWindow/MainWindow.axaml.cs @@ -1,15 +1,9 @@ using ApplicationServices; using Avalonia; -using Avalonia.Collections; using Avalonia.Controls; -using Avalonia.Data; using Avalonia.Markup.Xaml; -using DataLayer; using LibationWinForms.AvaloniaUI.Controls; -using LibationWinForms.AvaloniaUI.ViewModels; -using ReactiveUI; using System; -using System.Collections.ObjectModel; using System.Linq; using Avalonia.Threading; using LibationWinForms.AvaloniaUI.Views.ProductsGrid; diff --git a/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs index 9a36b9b4..14ff82fe 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/ProcessQueueControl2.axaml.cs @@ -12,24 +12,13 @@ namespace LibationWinForms.AvaloniaUI.Views { public partial class ProcessQueueControl2 : UserControl { - private readonly ProcessQueueViewModel _viewModel; - private ItemsRepeater _repeater; - private ScrollViewer _scroller; - private int _selectedIndex; - - private TrackedQueue2 Queue => _viewModel.Items; - - private readonly ProcessQueue.LogMe Logger; - + private readonly ProcessQueueViewModel _viewModel; + private readonly ProcessQueue.LogMe Logger; public ProcessQueueControl2() { InitializeComponent(); - _repeater = this.Get("repeater"); - _scroller = this.Get("scroller"); - _repeater.PointerPressed += RepeaterClick; - _repeater.KeyDown += RepeaterOnKeyDown; DataContext = _viewModel = new ProcessQueueViewModel(); Logger = ProcessQueue.LogMe.RegisterForm(_viewModel); @@ -178,22 +167,6 @@ namespace LibationWinForms.AvaloniaUI.Views Queue.MoveQueuePosition(item, queueButton); } - private void RepeaterClick(object sender, PointerPressedEventArgs e) - { - if ((e.Source as TextBlock)?.DataContext is ProcessBook2 item) - { - _viewModel.SelectedItem = item; - _selectedIndex = _viewModel.Items.IndexOf(item); - } - } - - private void RepeaterOnKeyDown(object sender, KeyEventArgs e) - { - if (e.Key == Key.F5) - { - //_viewModel.ResetItems(); - } - } public async void CancelAllBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) { Queue.ClearQueue(); diff --git a/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs index bdfd6148..d13c49dc 100644 --- a/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs +++ b/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs @@ -11,7 +11,6 @@ namespace LibationWinForms.AvaloniaUI.Views.ProductsGrid { public partial class ProductsDisplay2 { - private GridView.ImageDisplay imageDisplay; private void Configure_Buttons() { }