refactor: use --json while querying LFS locks instead of parse line-by-line with regex (#1858)

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

Author: love-linger

src/App.JsonCodeGen.cs

@@ -65,6 +65,7 @@ public override void Write(Utf8JsonWriter writer, DataGridLength value, JsonSeri
     [JsonSerializable(typeof(Models.ThemeOverrides))]
     [JsonSerializable(typeof(Models.Version))]
     [JsonSerializable(typeof(Models.RepositorySettings))]
+    [JsonSerializable(typeof(List<Models.LFSLock>))]
     [JsonSerializable(typeof(List<Models.VisualStudioInstance>))]
     [JsonSerializable(typeof(ViewModels.Preferences))]
     internal partial class JsonCodeGen : JsonSerializerContext { }

src/Commands/LFS.cs

@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text;
-using System.Text.RegularExpressions;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace SourceGit.Commands
 {
-    public partial class LFS : Command
+    public class LFS : Command
     {
-        [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")]
-        private static partial Regex REG_LOCK();
-
         public LFS(string repo)
         {
             WorkingDirectory = repo;
@@ -60,30 +56,23 @@ public async Task PruneAsync()
 
         public async Task<List<Models.LFSLock>> GetLocksAsync(string remote)
         {
-            Args = $"lfs locks --remote={remote}";
+            Args = $"lfs locks --json --remote={remote}";
 
             var rs = await ReadToEndAsync().ConfigureAwait(false);
-            var locks = new List<Models.LFSLock>();
-
             if (rs.IsSuccess)
             {
-                var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
-                foreach (var line in lines)
+                try
+                {
+                    var locks = JsonSerializer.Deserialize(rs.StdOut, JsonCodeGen.Default.ListLFSLock);
+                    return locks;
+                }
+                catch
                 {
-                    var match = REG_LOCK().Match(line);
-                    if (match.Success)
-                    {
-                        locks.Add(new Models.LFSLock()
-                        {
-                            File = match.Groups[1].Value,
-                            User = match.Groups[2].Value,
-                            ID = long.Parse(match.Groups[3].Value),
-                        });
-                    }
+                    // Ignore exceptions.
                 }
             }
 
-            return locks;
+            return [];
         }
 
         public async Task<bool> LockAsync(string remote, string file)

src/Models/LFSLock.cs

@@ -1,9 +1,22 @@
-namespace SourceGit.Models
+using System.Text.Json.Serialization;
+
+namespace SourceGit.Models
 {
+    public class LFSLockOwner
+    {
+        [JsonPropertyName("name")]
+        public string Name { get; set; } = string.Empty;
+    }
+
     public class LFSLock
     {
-        public string File { get; set; } = string.Empty;
-        public string User { get; set; } = string.Empty;
-        public long ID { get; set; } = 0;
+        [JsonPropertyName("id")]
+        public string ID { get; set; } = string.Empty;
+
+        [JsonPropertyName("path")]
+        public string Path { get; set; } = string.Empty;
+
+        [JsonPropertyName("owner")]
+        public LFSLockOwner Owner { get; set; } = null;
     }
 }

src/ViewModels/LFSLocks.cs

@@ -62,7 +62,7 @@ public async Task UnlockAsync(Models.LFSLock lfsLock, bool force)
 
             IsLoading = true;
 
-            var succ = await _repo.UnlockLFSFileAsync(_remote, lfsLock.File, force, false);
+            var succ = await _repo.UnlockLFSFileAsync(_remote, lfsLock.Path, force, false);
             if (succ)
             {
                 _cachedLocks.Remove(lfsLock);
@@ -84,7 +84,7 @@ private void UpdateVisibleLocks()
             {
                 foreach (var lfsLock in _cachedLocks)
                 {
-                    if (lfsLock.User.Equals(_userName, StringComparison.Ordinal))
+                    if (lfsLock.Owner.Name.Equals(_userName, StringComparison.Ordinal))
                         visible.Add(lfsLock);
                 }
             }

src/Views/LFSLocks.axaml

@@ -80,10 +80,10 @@
             <Grid ColumnDefinitions="26,*,100,32,32">
               <Path Grid.Column="0" Width="14" Height="14" Margin="8,0,4,0" Data="{StaticResource Icons.File}"/>
               <Border Grid.Column="1" Margin="4,0" ClipToBounds="True">
-                <TextBlock Text="{Binding File}" HorizontalAlignment="Left"/>
+                <TextBlock Text="{Binding Path}" HorizontalAlignment="Left"/>
               </Border>
               <Border Grid.Column="2" Margin="8,0" ClipToBounds="True">
-                <TextBlock Text="{Binding User}" HorizontalAlignment="Left"/>
+                <TextBlock Text="{Binding Owner.Name}" HorizontalAlignment="Left"/>
               </Border>
               <Button Grid.Column="3" Classes="icon_button" Click="OnUnlockButtonClicked" ToolTip.Tip="{DynamicResource Text.GitLFS.Locks.Unlock}">
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Unlock}"/>