diff --git a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs index 47173b02..e77f80f3 100644 --- a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs +++ b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs @@ -4,6 +4,7 @@ using Avalonia.Collections; using Avalonia.Controls; using Avalonia.Threading; using DataLayer; +using Dinah.Core.Collections.Generic; using LibationAvalonia.Dialogs.Login; using LibationFileManager; using LibationUiBase.GridView; @@ -11,7 +12,6 @@ using ReactiveUI; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Diagnostics; using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; @@ -103,17 +103,18 @@ namespace LibationAvalonia.ViewModels internal async Task BindToGridAsync(List dbBooks) { + //Get the UI thread's synchronization context and set it on the current thread to ensure + //it's available for GetAllProductsAsync and GetAllSeriesEntriesAsync var sc = await Dispatcher.UIThread.InvokeAsync(() => AvaloniaSynchronizationContext.Current); AvaloniaSynchronizationContext.SetSynchronizationContext(sc); var geList = await LibraryBookEntry.GetAllProductsAsync(dbBooks); var seriesEntries = await SeriesEntry.GetAllSeriesEntriesAsync(dbBooks); - //Create the filtered-in list before adding entries to avoid a refresh - FilteredInGridEntries = geList.Union(seriesEntries.SelectMany(s => s.Children)).FilterEntries(FilterString); - //Adding entries to the Source list will invoke CollectionFilter - //Perform on UI thread for safety - await Dispatcher.UIThread.InvokeAsync(() => SOURCE.AddRange(geList.Concat(seriesEntries).OrderDescending(new RowComparer(null)))); + //Add all IGridEntries to the SOURCE list. Note that SOURCE has not yet been linked to the UI via + //the GridEntries property, so adding items to SOURCE will not trigger any refreshes or UI action. + //This this can be done on any thread. + SOURCE.AddRange(geList.Concat(seriesEntries).OrderDescending(new RowComparer(null))); //Add all children beneath their parent foreach (var series in seriesEntries) @@ -123,10 +124,15 @@ namespace LibationAvalonia.ViewModels SOURCE.Insert(++seriesIndex, child); } - // Adding SOURCE to the DataGridViewCollection after building the source + //Create the filtered-in list before adding entries to GridEntries to avoid a refresh or UI action + FilteredInGridEntries = geList.Union(seriesEntries.SelectMany(s => s.Children)).FilterEntries(FilterString); + + // Adding SOURCE to the DataGridViewCollection _after_ building the SOURCE list //Saves ~500 ms on a library of ~4500 books. - //Perform on UI thread for safety + //Perform on UI thread for safety, but at this time, merely setting the DataGridCollectionView + //does not trigger UI actions in the way that modifying the list after it's been linked does. await Dispatcher.UIThread.InvokeAsync(() => GridEntries = new(SOURCE) { Filter = CollectionFilter }); + GridEntries.CollectionChanged += GridEntries_CollectionChanged; GridEntries_CollectionChanged(); } @@ -150,7 +156,7 @@ namespace LibationAvalonia.ViewModels #region Add new or update existing grid entries //Add absent entries to grid, or update existing entry - var allEntries = SOURCE.BookEntries().ToList(); + var allEntries = SOURCE.BookEntries().ToDictionarySafe(b => b.AudibleProductId); var seriesEntries = SOURCE.SeriesEntries().ToList(); var parentedEpisodes = dbBooks.ParentedEpisodes().ToHashSet(); @@ -158,7 +164,7 @@ namespace LibationAvalonia.ViewModels { foreach (var libraryBook in dbBooks.OrderBy(e => e.DateAdded)) { - var existingEntry = allEntries.FindByAsin(libraryBook.Book.AudibleProductId); + var existingEntry = allEntries.TryGetValue(libraryBook.Book.AudibleProductId, out var e) ? e : null; if (libraryBook.Book.IsProduct()) UpsertBook(libraryBook, existingEntry); diff --git a/Source/LibationUiBase/GridView/LibraryBookEntry[TStatus].cs b/Source/LibationUiBase/GridView/LibraryBookEntry[TStatus].cs index 85fbb9ea..2d118e36 100644 --- a/Source/LibationUiBase/GridView/LibraryBookEntry[TStatus].cs +++ b/Source/LibationUiBase/GridView/LibraryBookEntry[TStatus].cs @@ -33,6 +33,10 @@ namespace LibationUiBase.GridView LoadCover(); } + /// + /// Creates for all non-episode books in an enumeration of . + /// + /// Can be called from any thread, but requires the calling thread's to be valid. public static async Task> GetAllProductsAsync(IEnumerable libraryBooks) { var products = libraryBooks.Where(lb => lb.Book.IsProduct()).ToArray(); diff --git a/Source/LibationUiBase/GridView/SeriesEntry[TStatus].cs b/Source/LibationUiBase/GridView/SeriesEntry[TStatus].cs index ba3fef4f..17eeff93 100644 --- a/Source/LibationUiBase/GridView/SeriesEntry[TStatus].cs +++ b/Source/LibationUiBase/GridView/SeriesEntry[TStatus].cs @@ -56,6 +56,10 @@ namespace LibationUiBase.GridView LoadCover(); } + /// + /// Creates for all episodic series in an enumeration of . + /// + /// Can be called from any thread, but requires the calling thread's to be valid. public static async Task> GetAllSeriesEntriesAsync(IEnumerable libraryBooks) { var seriesBooks = libraryBooks.Where(lb => lb.Book.IsEpisodeParent()).ToArray(); diff --git a/Source/LibationWinForms/GridView/ProductsGrid.cs b/Source/LibationWinForms/GridView/ProductsGrid.cs index 790f5ba0..9a7f31c7 100644 --- a/Source/LibationWinForms/GridView/ProductsGrid.cs +++ b/Source/LibationWinForms/GridView/ProductsGrid.cs @@ -1,9 +1,9 @@ using DataLayer; using Dinah.Core; +using Dinah.Core.Collections.Generic; using Dinah.Core.WindowsDesktop.Forms; using LibationFileManager; using LibationUiBase.GridView; -using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; using System.Data; @@ -216,8 +216,12 @@ namespace LibationWinForms.GridView internal async Task BindToGridAsync(List dbBooks) { - var geList = await LibraryBookEntry.GetAllProductsAsync(dbBooks); + //Get the UI thread's synchronization context and set it on the current thread to ensure + //it's available for GetAllProductsAsync and GetAllSeriesEntriesAsync + var sc = Invoke(() => System.Threading.SynchronizationContext.Current); + System.Threading.SynchronizationContext.SetSynchronizationContext(sc); + var geList = await LibraryBookEntry.GetAllProductsAsync(dbBooks); var seriesEntries = await SeriesEntry.GetAllSeriesEntriesAsync(dbBooks); geList.AddRange(seriesEntries); @@ -232,9 +236,12 @@ namespace LibationWinForms.GridView foreach (var child in series.Children) geList.Insert(++seriesIndex, child); } - + System.Threading.SynchronizationContext.SetSynchronizationContext(null); + bindingList = new GridEntryBindingList(geList); bindingList.CollapseAll(); + + //The syncBindingSource ensures that the IGridEntry list is added on the UI thread syncBindingSource.DataSource = bindingList; VisibleCountChanged?.Invoke(this, bindingList.GetFilteredInItems().Count()); } @@ -252,14 +259,19 @@ namespace LibationWinForms.GridView //Add absent entries to grid, or update existing entry - var allEntries = bindingList.AllItems().BookEntries(); + var allEntries = bindingList.AllItems().BookEntries().ToDictionarySafe(b => b.AudibleProductId); var seriesEntries = bindingList.AllItems().SeriesEntries().ToList(); var parentedEpisodes = dbBooks.ParentedEpisodes().ToHashSet(); + //Get the UI thread's synchronization context and set it on the current thread to ensure + //it's available for creation of new IGridEntry items during upsert + var sc = Invoke(() => System.Threading.SynchronizationContext.Current); + System.Threading.SynchronizationContext.SetSynchronizationContext(sc); + bindingList.RaiseListChangedEvents = false; foreach (var libraryBook in dbBooks.OrderBy(e => e.DateAdded)) { - var existingEntry = allEntries.FindByAsin(libraryBook.Book.AudibleProductId); + var existingEntry = allEntries.TryGetValue(libraryBook.Book.AudibleProductId, out var e) ? e : null; if (libraryBook.Book.IsProduct()) { @@ -289,6 +301,10 @@ namespace LibationWinForms.GridView .BookEntries() .ExceptBy(dbBooks.Select(lb => lb.Book.AudibleProductId), ge => ge.AudibleProductId); + removedBooks = bindingList + .AllItems() + .BookEntries().Take(10).ToList(); + RemoveBooks(removedBooks); gridEntryDataGridView.FirstDisplayedScrollingRowIndex = topRow;