fix: KiTTY session file selection dialog does not appear close #787

VShawn · VShawn · commit 9514fcd05398 · 2024-12-01T10:42:49.000+08:00
diff --git a/Ui/Utils/KiTTY/Model/KittyConfig.cs b/Ui/Utils/KiTTY/Model/KittyConfig.cs
@@ -37,6 +37,10 @@ public static List<KittyConfigKeyValuePair> Read(string path)
                 {
                     var para = line.Substring(0, i0);
                     var val = line.Substring(i0 + 1).TrimEnd('\\');
+                    if (string.IsNullOrWhiteSpace(para) || string.IsNullOrWhiteSpace(val))
+                    {
+                        continue;
+                    }
                     if (double.TryParse(val.Replace(',', '_'), out _))
                     {
                         ret.Add(new KittyConfigKeyValuePair() { Key = para, Value = val, ValueKind = RegistryValueKind.DWord });
diff --git a/Ui/View/Editor/Forms/SshFormView.xaml.cs b/Ui/View/Editor/Forms/SshFormView.xaml.cs
@@ -4,6 +4,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using _1RM.Model.Protocol;
+using _1RM.Utils;
 using _1RM.Utils.KiTTY;
 using _1RM.Utils.KiTTY.Model;
 using Shawn.Utils.Wpf.FileSystem;
@@ -60,18 +61,18 @@ private void CbUsePrivateKey_OnChecked(object sender, RoutedEventArgs e)
 
         private void ButtonSelectSessionConfigFile_OnClick(object sender, RoutedEventArgs e)
         {
-            if (DataContext is IKittyConnectable pc)
+            if (DataContext is SshFormViewModel vm)
             {
                 var path = SelectFileHelper.OpenFile(filter: "KiTTY Session|*.*");
                 if (path == null) return;
-                if (File.Exists(path)
-                && KittyConfig.Read(path)?.Count > 0)
+                if (File.Exists(path) && KittyConfig.Read(path)?.Count > 0)
                 {
-                    pc.ExternalKittySessionConfigPath = path;
+                    vm.New.ExternalKittySessionConfigPath = path;
                 }
                 else
                 {
-                    pc.ExternalKittySessionConfigPath = "";
+                    vm.New.ExternalKittySessionConfigPath = "";
+                    MessageBoxHelper.Warning("Invalid KiTTY session config file.");
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ public static List<KittyConfigKeyValuePair> Read(string path)`
`37`	`37`	`{`
`38`	`38`	`var para = line.Substring(0, i0);`
`39`	`39`	`var val = line.Substring(i0 + 1).TrimEnd('\\');`
	`40`	`+ if (string.IsNullOrWhiteSpace(para) \|\| string.IsNullOrWhiteSpace(val))`
	`41`	`+ {`
	`42`	`+ continue;`
	`43`	`+ }`
`40`	`44`	`if (double.TryParse(val.Replace(',', '_'), out _))`
`41`	`45`	`{`
`42`	`46`	`ret.Add(new KittyConfigKeyValuePair() { Key = para, Value = val, ValueKind = RegistryValueKind.DWord });`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Windows.Controls;`
`5`	`5`	`using System.Windows.Data;`
`6`	`6`	`using _1RM.Model.Protocol;`
	`7`	`+using _1RM.Utils;`
`7`	`8`	`using _1RM.Utils.KiTTY;`
`8`	`9`	`using _1RM.Utils.KiTTY.Model;`
`9`	`10`	`using Shawn.Utils.Wpf.FileSystem;`
`@@ -60,18 +61,18 @@ private void CbUsePrivateKey_OnChecked(object sender, RoutedEventArgs e)`
`60`	`61`
`61`	`62`	`private void ButtonSelectSessionConfigFile_OnClick(object sender, RoutedEventArgs e)`
`62`	`63`	`{`
`63`		`- if (DataContext is IKittyConnectable pc)`
	`64`	`+ if (DataContext is SshFormViewModel vm)`
`64`	`65`	`{`
`65`	`66`	`var path = SelectFileHelper.OpenFile(filter: "KiTTY Session\|.");`
`66`	`67`	`if (path == null) return;`
`67`		`- if (File.Exists(path)`
`68`		`- && KittyConfig.Read(path)?.Count > 0)`
	`68`	`+ if (File.Exists(path) && KittyConfig.Read(path)?.Count > 0)`
`69`	`69`	`{`
`70`		`- pc.ExternalKittySessionConfigPath = path;`
	`70`	`+ vm.New.ExternalKittySessionConfigPath = path;`
`71`	`71`	`}`
`72`	`72`	`else`
`73`	`73`	`{`
`74`		`- pc.ExternalKittySessionConfigPath = "";`
	`74`	`+ vm.New.ExternalKittySessionConfigPath = "";`
	`75`	`+ MessageBoxHelper.Warning("Invalid KiTTY session config file.");`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`	`}`