conditional re-index

bug fixes, esp. threading

AppScaffolding/AppScaffolding.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>6.0.4.1</Version>
+    <Version>6.0.6.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

DataLayer/EfClasses/UserDefinedItem.cs

@@ -106,6 +106,11 @@ namespace DataLayer
         #endregion
 
         #region LiberatedStatuses
+        /// <summary>
+        /// Occurs when <see cref="Tags"/>, <see cref="BookStatus"/>, or <see cref="PdfStatus"/> values change.
+        /// This signals the change of the in-memory value; it does not ensure that the new value has been persisted.
+        /// </summary>
+        public static event EventHandler<string> ItemChanged;
 
         private LiberatedStatus _bookStatus;
         private LiberatedStatus? _pdfStatus;
@@ -132,13 +137,41 @@ namespace DataLayer
                     ItemChanged?.Invoke(this, nameof(PdfStatus));
                 }
             }
+        }
+		#endregion
+
+		#region batch changes
+		public static event EventHandler<string> Batch_ItemChanged;
+        public void BatchMode_UpdateBookStatus(LiberatedStatus value)
+        {
+            if (_bookStatus != value)
+            {
+                _bookStatus = value;
+                batchFlag = true;
+            }
+        }
+
+        // don't overwrite current with null. Therefore input is "LiberatedStatus" not "LiberatedStatus?"
+        public void BatchMode_UpdatePdfStatus(LiberatedStatus value)
+        {
+            if (_pdfStatus != value)
+            {
+                _pdfStatus = value;
+                batchFlag = true;
+            }
+        }
+
+        private static bool batchFlag = false;
+
+        public static void BatchMode_Finalize()
+        {
+            if (batchFlag)
+                Batch_ItemChanged?.Invoke(null, null);
+
+            batchFlag = false;
         }
         #endregion
-        /// <summary>
-        /// Occurs when <see cref="Tags"/>, <see cref="BookStatus"/>, or <see cref="PdfStatus"/> values change.
-        /// This signals the change of the in-memory value; it does not ensure that the new value has been persisted.
-        /// </summary>
-        public static event EventHandler<string> ItemChanged;
+
         public override string ToString() => $"{Book} {Rating} {Tags}";
 	}
 }

LibationSearchEngine/SearchEngine.cs

@@ -315,7 +315,7 @@ namespace LibationSearchEngine
             var docs = searcher.Search(query, 1);
             var scoreDoc = docs.ScoreDocs.SingleOrDefault();
             if (scoreDoc == null)
-                throw new Exception("document not found");
+                return;
             var document = searcher.Doc(scoreDoc.Doc);
 
 

LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs

@@ -38,7 +38,7 @@ namespace LibationWinForms.Dialogs
 			this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
 			this.btnRemoveBooks = new System.Windows.Forms.Button();
 			this.label1 = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
@@ -176,7 +176,7 @@ namespace LibationWinForms.Dialogs
         #endregion
 
         private System.Windows.Forms.DataGridView _dataGridView;
-        private System.Windows.Forms.BindingSource gridEntryBindingSource;
+        private LibationWinForms.SyncBindingSource gridEntryBindingSource;
         private System.Windows.Forms.Button btnRemoveBooks;
         private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;

LibationWinForms/Form1.cs

@@ -34,6 +34,8 @@ namespace LibationWinForms
 			this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
 			LibraryCommands.LibrarySizeChanged += reloadGridAndUpdateBottomNumbers;
 			LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
+			// used by async migrations to update ui when complete
+			DataLayer.UserDefinedItem.Batch_ItemChanged += reloadGridAndUpdateBottomNumbers;
 
 			var format = System.Drawing.Imaging.ImageFormat.Jpeg;
 			PictureStorage.SetDefaultImage(PictureSize._80x80, Properties.Resources.default_cover_80x80.ToBytes(format));

LibationWinForms/GridEntry.cs

@@ -27,17 +27,16 @@ namespace LibationWinForms
 
 		#endregion
 
+		public event EventHandler Committed;
+
 		private Book Book => LibraryBook.Book;
 		private Image _cover;
-		private Action Refilter { get; }
 
-		public GridEntry(LibraryBook libraryBook, Action refilterOnChanged = null)
+		public GridEntry(LibraryBook libraryBook)
 		{
 			LibraryBook = libraryBook;
-			Refilter = refilterOnChanged;
 			_memberValues = CreateMemberValueDictionary();
 
-
 			//Get cover art. If it's default, subscribe to PictureCached
 			{
 				(bool isDefault, byte[] picture) = FileManager.PictureStorage.GetPicture(new FileManager.PictureDefinition(Book.PictureId, FileManager.PictureSize._80x80));
@@ -142,7 +141,7 @@ namespace LibationWinForms
 
 			Book.UserDefinedItem.BookStatus = displayStatus;
 
-			Refilter?.Invoke();
+			Committed?.Invoke(this, null);
 		}
 
 		#endregion	

LibationWinForms/ProductsGrid.Designer.cs

@@ -30,7 +30,7 @@
 		{
             this.components = new System.ComponentModel.Container();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.gridEntryBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
             this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
             this.dataGridViewImageButtonBoxColumn1 = new LibationWinForms.LiberateDataGridViewImageButtonColumn();
             this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
@@ -222,7 +222,7 @@
 
 		#endregion
 
-		private System.Windows.Forms.BindingSource gridEntryBindingSource;
+		private LibationWinForms.SyncBindingSource gridEntryBindingSource;
 		private System.Windows.Forms.DataGridView gridEntryDataGridView;
         private LiberateDataGridViewImageButtonColumn dataGridViewImageButtonBoxColumn1;
         private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;

LibationWinForms/ProductsGrid.cs

@@ -3,9 +3,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ApplicationServices;
-using DataLayer;
 using Dinah.Core;
 using Dinah.Core.DataBinding;
+using Dinah.Core.Threading;
 using Dinah.Core.Windows.Forms;
 using LibationWinForms.Dialogs;
 
@@ -130,7 +130,12 @@ namespace LibationWinForms
 			}
 
 			var orderedGridEntries = lib
-				.Select(lb => new GridEntry(lb, Filter)).ToList()
+				.Select(lb =>
+				{
+					var entry = new GridEntry(lb);
+					entry.Committed += (_, __) => Filter();
+					return entry;
+				}).ToList()
 				// default load order
 				.OrderByDescending(ge => (DateTime)ge.GetMemberValue(nameof(ge.PurchaseDate)))
 				//// more advanced example: sort by author, then series, then title
@@ -166,8 +171,11 @@ namespace LibationWinForms
 			var bindingContext = BindingContext[_dataGridView.DataSource];
 			bindingContext.SuspendBinding();
 			{
-				for (var r = _dataGridView.RowCount - 1; r >= 0; r--)
-					_dataGridView.Rows[r].Visible = productIds.Contains(getGridEntry(r).AudibleProductId);
+				this.UIThreadSync(() =>
+				{
+					for (var r = _dataGridView.RowCount - 1; r >= 0; r--)
+						_dataGridView.Rows[r].Visible = productIds.Contains(getGridEntry(r).AudibleProductId);
+				});
 			}
 
 			//Causes repainting of the DataGridView

LibationWinForms/Program.cs

@@ -259,22 +259,26 @@ namespace LibationWinForms
 
 					// assign these strings and enums/ints unconditionally. EFCore will only update if changed
 					if (fileType == FileType.PDF)
-						book.UserDefinedItem.PdfStatus = LiberatedStatus.Liberated;
+						book.UserDefinedItem.BatchMode_UpdatePdfStatus(LiberatedStatus.Liberated);
 
 					if (fileType == FileType.Audio)
 					{
 						var lhack = libhackFiles.FirstOrDefault(f => f.ContainsInsensitive(asin));
 						if (lhack is null)
-							book.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
+							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Liberated);
 						else
 						{
-							book.UserDefinedItem.BookStatus = LiberatedStatus.Error;
+							book.UserDefinedItem.BatchMode_UpdateBookStatus(LiberatedStatus.Error);
 							libhackFilesToDelete.Add(lhack);
 						}
 					}
 				}
 
-				context.SaveChanges();
+				// in order: save to db, full reindex from db, refresh ui
+				var changed = context.SaveChanges();
+				if (changed > 0)
+					ApplicationServices.SearchEngineCommands.FullReIndex();
+				UserDefinedItem.BatchMode_Finalize();
 
 				// only do this after save changes
 				foreach (var libhackFile in libhackFilesToDelete)

LibationWinForms/SyncBindingSource.cs

@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+using System.Windows.Forms;
+
+// https://stackoverflow.com/a/32886415
+namespace LibationWinForms
+{
+    public class SyncBindingSource : BindingSource
+    {
+        private SynchronizationContext syncContext { get; }
+
+        public SyncBindingSource() : base()
+            => syncContext = SynchronizationContext.Current;
+        public SyncBindingSource(IContainer container) : base(container)
+            => syncContext = SynchronizationContext.Current;
+        public SyncBindingSource(object dataSource, string dataMember) : base(dataSource, dataMember)
+            => syncContext = SynchronizationContext.Current;
+
+        protected override void OnListChanged(ListChangedEventArgs e)
+        {
+            if (syncContext != null)
+                syncContext.Send(_ => base.OnListChanged(e), null);
+            else
+                base.OnListChanged(e);
+        }
+    }
+}