code_style: cleanup code about SSH key helper

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Models/SSHKeyPair.cs

@@ -6,18 +6,19 @@ namespace SourceGit.Models
 {
     public class SSHKeyPair
     {
-        public string Name { get; set; }
-        public string FullPath { get; set; }
-        public string PublicKey { get; set; }
+        public string PrivateKeyPath { get; set; }
+        public string PublicKeyPath { get; set; }
+        public string RawPublicKey { get; set; }
         public string Fingerprint { get; set; } = "--- (invalid)";
+        public string Name => Path.GetFileName(PrivateKeyPath);
 
-        public SSHKeyPair(string file)
+        public SSHKeyPair(string privateKey, string publicKey)
         {
-            Name = Path.GetFileName(file);
-            FullPath = file;
-            PublicKey = File.ReadAllText($"{file}.pub");
+            PrivateKeyPath = privateKey;
+            PublicKeyPath = publicKey;
+            RawPublicKey = File.ReadAllText(publicKey);
 
-            var parts = PublicKey.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+            var parts = RawPublicKey.Split(' ', StringSplitOptions.RemoveEmptyEntries);
             if (parts.Length != 3)
                 return;
 

src/ViewModels/SSHKeyGenerator.cs

@@ -63,11 +63,6 @@ public string ErrorMessage
             set => SetProperty(ref _errorMessage, value);
         }
 
-        public SSHKeyGenerator(string baseDir)
-        {
-            _baseDir = baseDir;
-        }
-
         public static ValidationResult ValidatePassphrase(string password, ValidationContext context)
         {
             var instance = (SSHKeyGenerator)context.ObjectInstance;
@@ -95,16 +90,17 @@ public static ValidationResult ValidateConfirmedPassphrase(string confirmedPassw
             return ValidationResult.Success;
         }
 
-        public bool Run()
+        public Models.SSHKeyPair Run()
         {
             ErrorMessage = string.Empty;
 
             ValidateAllProperties();
             if (HasErrors)
-                return false;
+                return null;
 
+            var dir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh");
             var passphrase = _usePassphrase ? _passphrase : string.Empty;
-            var keyFile = Path.Combine(_baseDir, _name);
+            var keyFile = Path.Combine(dir, _name);
             var start = new ProcessStartInfo();
             start.FileName = "ssh-keygen";
             start.Arguments = $"-q -t ed25519 -N {passphrase.Quoted()} -C {_email.Quoted()} -f {keyFile.Quoted()}";
@@ -120,16 +116,20 @@ public bool Run()
             catch (Exception e)
             {
                 ErrorMessage = $"Failed to generate SSH key: {e.Message}";
-                return false;
+                return null;
             }
 
-            return true;
+            var publicKeyFile = keyFile + ".pub";
+            if (File.Exists(keyFile) && File.Exists(publicKeyFile))
+                return new Models.SSHKeyPair(keyFile, publicKeyFile);
+
+            ErrorMessage = "Failed to generate SSH key: Key files not found.";
+            return null;
         }
 
         [GeneratedRegex(@"^[0-9a-zA-Z_\-\@\#\$\%\!\&\+\=]+$")]
         private static partial Regex REG_PSWD_FORMAT();
 
-        private string _baseDir;
         private string _name;
         private string _email;
         private bool _usePassphrase;

src/ViewModels/SSHKeyHelper.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
 
 using Avalonia.Collections;
-using Avalonia.Threading;
-
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -31,41 +28,33 @@ public SSHKeyGenerator Generator
 
         public SSHKeyHelper()
         {
-            _baseDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh");
             Keys = new AvaloniaList<Models.SSHKeyPair>();
 
-            Task.Run(() =>
+            var sshDir = new DirectoryInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh"));
+            if (sshDir.Exists)
             {
-                var sshDir = new DirectoryInfo(_baseDir);
+                var files = sshDir.GetFiles("*.pub");
                 var keys = new List<Models.SSHKeyPair>();
 
-                if (sshDir.Exists)
+                foreach (var file in files)
                 {
-                    var files = sshDir.GetFiles("*.pub");
-                    foreach (var file in files)
-                    {
-                        var privateKeyPath = file.FullName.Substring(0, file.FullName.Length - 4);
-                        if (File.Exists(privateKeyPath))
-                            keys.Add(new(privateKeyPath));
-                    }
-
-                    keys.Sort((l, r) => l.Name.CompareTo(r.Name));
+                    var privateKeyPath = file.FullName.Substring(0, file.FullName.Length - 4);
+                    if (File.Exists(privateKeyPath))
+                        keys.Add(new(privateKeyPath, file.FullName));
                 }
 
                 if (keys.Count > 0)
                 {
-                    Dispatcher.UIThread.Post(() =>
-                    {
-                        Keys.AddRange(keys);
-                        SelectedKey = keys[0];
-                    });
+                    keys.Sort((l, r) => l.Name.CompareTo(r.Name));
+                    Keys.AddRange(keys);
+                    SelectedKey = keys[0];
                 }
-            });
+            }
         }
 
         public void OpenGenerator()
         {
-            Generator = new SSHKeyGenerator(_baseDir);
+            Generator = new SSHKeyGenerator();
         }
 
         public void CloseGenerator()
@@ -75,18 +64,12 @@ public void CloseGenerator()
 
         public void Generate()
         {
-            var succ = _generator.Run();
-            if (!succ)
+            var key = _generator.Run();
+            if (key == null)
                 return;
 
-            var keyFile = Path.Combine(_baseDir, $"{_generator.Name}");
-            if (File.Exists(keyFile))
-            {
-                var added = new Models.SSHKeyPair(keyFile);
-                Keys.Add(added);
-                SelectedKey = added;
-            }
-
+            Keys.Add(key);
+            SelectedKey = key;
             Generator = null;
         }
 
@@ -98,10 +81,10 @@ public void DeleteSelected()
 
             try
             {
-                if (File.Exists(key.FullPath))
-                    File.Delete(key.FullPath);
-                if (File.Exists($"{key.FullPath}.pub"))
-                    File.Delete($"{key.FullPath}.pub");
+                if (File.Exists(key.PrivateKeyPath))
+                    File.Delete(key.PrivateKeyPath);
+                if (File.Exists(key.PublicKeyPath))
+                    File.Delete(key.PublicKeyPath);
 
                 var idx = Keys.IndexOf(key);
                 if (idx >= 0)
@@ -122,7 +105,6 @@ public void DeleteSelected()
             }
         }
 
-        private string _baseDir = null;
         private Models.SSHKeyPair _selectedKey = null;
         private SSHKeyGenerator _generator = null;
     }

src/Views/SSHKeyHelper.axaml

@@ -122,7 +122,7 @@
               <TextBlock Classes="group_header_label"
                          Text="{DynamicResource Text.SSHKeyHelper.Path}"/>
               <SelectableTextBlock Margin="0,6,0,0"
-                                   Text="{Binding FullPath, Mode=OneWay}"
+                                   Text="{Binding PrivateKeyPath, Mode=OneWay}"
                                    TextWrapping="Wrap"/>
 
               <TextBlock Classes="group_header_label"
@@ -137,7 +137,7 @@
                          Text="{DynamicResource Text.SSHKeyHelper.PublicKey}"/>
               <TextBox Height="80"
                        Margin="0,6,0,0" Padding="2"
-                       Text="{Binding PublicKey}"
+                       Text="{Binding RawPublicKey}"
                        IsReadOnly="True"
                        CornerRadius="4"
                        TextWrapping="Wrap"

src/Views/SSHKeyHelper.axaml.cs

@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -46,8 +46,8 @@ private async void OnDeleteSelectedKey(object sender, RoutedEventArgs e)
             message
                 .AppendLine(App.Text("SSHKeyHelper.ConfirmDeletion"))
                 .AppendLine()
-                .Append("- ").Append(key.FullPath).AppendLine()
-                .Append("- ").Append(key.FullPath).Append(".pub");
+                .Append("• ").Append(key.PrivateKeyPath).AppendLine()
+                .Append("• ").Append(key.PublicKeyPath);
 
             var yes = await App.AskConfirmAsync(message.ToString(), Models.ConfirmButtonType.YesNo);
             if (yes)