From 6f8ac996fd88a306c205c8d0b7a0c78506275f5c Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Thu, 26 Sep 2024 10:18:29 +0200
Subject: [PATCH] minor fixes

---
 .../Ui/MainForm.Designer.cs                   |  1 +
 ModpackUpdater.Apps.Manager/Ui/MainForm.cs    | 44 +++++++++++--------
 ModpackUpdater/InstallInfos.cs                |  6 ++-
 ModpackUpdater/UpdateInfos.cs                 |  6 ++-
 4 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ModpackUpdater.Apps.Manager/Ui/MainForm.Designer.cs b/ModpackUpdater.Apps.Manager/Ui/MainForm.Designer.cs
index 7adcfee..4321b1f 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainForm.Designer.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainForm.Designer.cs
@@ -192,6 +192,7 @@ partial class MainForm
         // 
         radMenuItem_SaveWorkspace.Name = "radMenuItem_SaveWorkspace";
         radMenuItem_SaveWorkspace.Text = "Save";
+        radMenuItem_SaveWorkspace.Click += RadMenuItem_SaveWorkspace_Click;
         // 
         // radMenuSeparatorItem1
         // 
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainForm.cs b/ModpackUpdater.Apps.Manager/Ui/MainForm.cs
index f7ff0a1..ceac685 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainForm.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainForm.cs
@@ -169,7 +169,7 @@ public partial class MainForm : RadForm, IMainApi
             item.Text = string.Format(GeneralLangRes.Node_Install, infos.Version.ToString());
         else
             item.Text = infos.Version.ToString();
-        
+
         item.SvgImage = AppGlobals.Symbols.GetSvgImage(infos.IsPublic ? AppSymbols.eye : AppSymbols.invisible, SymbolSize.Small);
     }
 
@@ -399,6 +399,11 @@ public partial class MainForm : RadForm, IMainApi
         }
     }
 
+    private void RadMenuItem_SaveWorkspace_Click(object sender, EventArgs e)
+    {
+        wsInfo?.Workspace.Save();
+    }
+
     private void RadMenuItem_ToolsItem_Click(object? sender, EventArgs e)
     {
         if (sender is RadMenuItem item && item.Tag is PluginFunction func)
@@ -446,8 +451,25 @@ public partial class MainForm : RadForm, IMainApi
         var newValue = e.Row.Cells[e.Column.Name].Value;
         var colName = e.Column.Name;
 
-        if (newValue is string valueStr)
+        if (newValue is bool valueBool)
         {
+            switch (colName)
+            {
+                case "iszip":
+                    action.IsZip = valueBool;
+                    break;
+                case "isextra":
+                    action.IsExtra = valueBool;
+                    break;
+                case "isdir":
+                    if (uaction is not null)
+                        uaction.IsDirectory = valueBool;
+                    break;
+            }
+        }
+        else
+        {
+            var valueStr = newValue as string ?? string.Empty;
             var valueNullStr = valueStr.Nullify();
 
             switch (colName)
@@ -477,7 +499,7 @@ public partial class MainForm : RadForm, IMainApi
                     action.SourceName = valueNullStr;
                     break;
                 case "srcregex":
-                    action.SourceTag = valueNullStr;
+                    action.SourceRegex = valueNullStr;
                     break;
                 case "srctag":
                     action.SourceTag = valueNullStr;
@@ -499,22 +521,6 @@ public partial class MainForm : RadForm, IMainApi
                     break;
             }
         }
-        else if (newValue is bool valueBool)
-        {
-            switch (colName)
-            {
-                case "iszip":
-                    action.IsZip = valueBool;
-                    break;
-                case "isextra":
-                    action.IsExtra = valueBool;
-                    break;
-                case "isdir":
-                    if (uaction is not null)
-                        uaction.IsDirectory = valueBool;
-                    break;
-            }
-        }
     }
 
     private void RadMenuItem_Updates_DropDownOpening(object sender, System.ComponentModel.CancelEventArgs e)
diff --git a/ModpackUpdater/InstallInfos.cs b/ModpackUpdater/InstallInfos.cs
index 2a25a73..26fc069 100644
--- a/ModpackUpdater/InstallInfos.cs
+++ b/ModpackUpdater/InstallInfos.cs
@@ -22,6 +22,10 @@ public class InstallInfos : IActionSetInfos
 
     public override string ToString()
     {
-        return JsonConvert.SerializeObject(this);
+        return JsonConvert.SerializeObject(this, new JsonSerializerSettings
+        {
+            Formatting = Formatting.Indented,
+            DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
+        });
     }
 }
\ No newline at end of file
diff --git a/ModpackUpdater/UpdateInfos.cs b/ModpackUpdater/UpdateInfos.cs
index 7859120..bf9642b 100644
--- a/ModpackUpdater/UpdateInfos.cs
+++ b/ModpackUpdater/UpdateInfos.cs
@@ -13,6 +13,10 @@ public class UpdateInfos
 
     public override string ToString()
     {
-        return JsonConvert.SerializeObject(this);
+        return JsonConvert.SerializeObject(this, new JsonSerializerSettings
+        {
+            Formatting = Formatting.Indented,
+            DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
+        });
     }
 }
\ No newline at end of file