Merge pull request #23 from mmeents/develop

Adds Modified property to track if anything changed. worked out sorti…

Author: mmeents

PackedTables.Viewer.Winforms/PackedTables.Viewer/Form1.cs

@@ -92,6 +92,22 @@ private void DoOpenFileTable() {
     }
 
     private void DoCloseFileTable() {
+
+      if (_workingPack != null && _workingPack!.Modified) { 
+        if (MessageBox.Show("You have unsaved changes. Do you want to save before closing?", "Unsaved Changes", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) {
+          if (!string.IsNullOrEmpty(_fileName)) {
+            _workingPack.SaveToFile(_fileName);
+            AddFileToMRUL(_fileName);
+          } else {
+            if (saveDialog.ShowDialog() == DialogResult.OK) {
+              _fileName = saveDialog.FileName;
+              _workingPack.SaveToFile(_fileName);
+              AddFileToMRUL(_fileName);
+            }
+          }
+        }
+      }
+
       btnOpenClose.Text = "Open";
       btnBrowse.Visible = true;
       comboBox1.Visible = true;
@@ -101,6 +117,7 @@ private void DoCloseFileTable() {
       LogMsg(_fileName + " closed.");
       _column = null;
       _table = null;
+      _workingPack = null;
       splitContainer3_Panel1_Resize(null, null);
     }
 
@@ -109,8 +126,7 @@ private void btnOpenClose_Click(object sender, EventArgs e) {
       if (btnOpenClose.Text == "Open") {
         _fileName = comboBox1.SelectedItem?.ToString();
         DoOpenFileTable();
-      } else if (btnOpenClose.Text == "Close") {
-        _workingPack = null;
+      } else if (btnOpenClose.Text == "Close") {        
         DoCloseFileTable();
       }
     }
@@ -329,6 +345,7 @@ private void vrMain_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseE
       } else {
         OrderByColumnName = columnName;
       }
+      _table.RebuildRowIndex();
       LoadDataGridViewFromTable(_table!);
     }
 

src/FieldModel.cs

@@ -43,8 +43,10 @@ public Object Value {
             } 
           }
           throw new Exception($"FieldModel:Column ValueType {this.ValueType} does not match new data type {FieldExt.GetColumnType(value)}");
+        }      
+        if (this.OwnerRow != null && this.OwnerRow.Owner != null && this.OwnerRow.Owner.Owner != null) {
+          this.OwnerRow.Owner.Owner.Modified = true;
         }
-
       }
     }
   }

src/PackedTableSet.cs

@@ -4,7 +4,12 @@ namespace PackedTables.Net
 {
   // 
   public class PackedTableSet {
-    private string _FileName { get; set; } = "";
+    private string _fileName { get; set; } = "";
+    private bool _modified { get; set; } = false;
+    public bool Modified {
+      get { return _modified; }
+      set { _modified = value; }
+    }
     private DataSetModel _Package { get; set; } = new DataSetModel();
 
     public PackedTableSet() {}
@@ -32,6 +37,7 @@ public void LoadFromBase64String(string base64) {
           ResetOwnership();
         }
       }
+      _modified = false;
     }
 
     private void ResetOwnership() {
@@ -48,7 +54,8 @@ private void ResetOwnership() {
 
     public void LoadFromFile(string fileName) {
       if (File.Exists(fileName)) {
-        _FileName = fileName;
+        _fileName = fileName;
+        _modified = false;
         var encoded = Task.Run(async () => await fileName.ReadAllTextAsync().ConfigureAwait(false)).GetAwaiter().GetResult();
         LoadFromBase64String(encoded);
       }
@@ -57,6 +64,7 @@ public void LoadFromFile(string fileName) {
     public void SaveToFile(string fileName) {
       var base64 = SaveToBase64String();
       Task.Run(async () => await base64.WriteAllTextAsync(fileName).ConfigureAwait(false)).GetAwaiter().GetResult();
+      _modified = false;
     }
 
     public string SaveToJson() {
@@ -73,6 +81,7 @@ public void LoadFromJson(string json) {
           ResetOwnership();
         }
       }
+      _modified = false;
     }
     #endregion
 
@@ -106,6 +115,7 @@ public TableModel AddTable(string tableName) {
       };
       _Package.Tables[tableNew.Id] = tableNew;
       _Package.NameIndex[tableName] = tableNew.Id;
+      _modified = true;
       return tableNew;
     }
 
@@ -127,6 +137,7 @@ public void RemoveTable(string tableName) {
       if (table != null) {
         _Package.Tables.TryRemove(table.Id, out _);
         _Package.NameIndex.TryRemove(tableName, out _);
+        _modified = true;
       } else {
         throw new Exception($"Table {tableName} does not exist.");
       }

src/PackedTables.Net.csproj

@@ -11,7 +11,7 @@
     <PackageProjectUrl>https://github.com/mmeents/PackedTables.NET</PackageProjectUrl>    
     <PackageTags>MessagePack Tables</PackageTags>    
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>1.1.1</Version>
+    <Version>1.1.2</Version>
     <Title>PackedTables.NET</Title>
     <Authors>$(AssemblyName)</Authors>
     <Copyright> Copyright © 2025 MattMeents</Copyright>

src/RowModel.cs

@@ -58,10 +58,16 @@ public FieldModel this[string columnName] {
         if (value != null) {
           if (value.ColumnId != columnId) throw new Exception("ColumnId mismatch");
           RowFields[value.Id] = value;
+          if (this.Owner != null && this.Owner.Owner != null) {
+            this.Owner.Owner!.Modified = true;
+          }
         } else {
           var field = RowFields?.FirstOrDefault(x => x.Value.ColumnId == columnId);
           if (field != null) {
-            RowFields!.Remove(field.Value.Value.Id, out var field1);  
+            RowFields!.Remove(field.Value.Value.Id, out var field1);
+            if (this.Owner != null && this.Owner.Owner != null) {
+              this.Owner.Owner!.Modified = true;
+            }
           }
         }
       }

src/TableModel.cs

@@ -79,6 +79,9 @@ public ColumnModel AddColumn(string columnName, ColumnType columnType) {
         };
         row.RowFields[field.Id] = field;
       }
+      if (this.Owner != null ) {
+        this.Owner.Modified = true;
+      }      
       return column;
     }
 
@@ -94,6 +97,9 @@ public void RemoveColumn(int columnId) {
         _ = this._columnOrderByRankToIdIndex.TryRemove(column.Rank, out _);
         this.Columns.Remove(columnId, out var columnM);
         this.RebuildColumnIndex();
+        if (this.Owner != null) {
+          this.Owner.Modified = true;
+        }
       }
     }
 
@@ -187,13 +193,19 @@ public RowModel AddRow() {
         }
       }
       Current = newRow;
+      if (this.Owner != null) {
+        this.Owner.Modified = true;
+      }
       return newRow;      
     }
     public void RemoveRow(RowModel row) {     
       if (row == null) return;
       if (Rows.ContainsKey(row.Id)) {
         _ = Rows.TryRemove(row.Id, out _);
         RebuildRowIndex();
+        if (this.Owner != null) {
+          this.Owner.Modified = true;
+        }
       }     
     }