Merge branch 'release/v2025.21'

Author: love-linger

README.md

@@ -56,7 +56,7 @@ You can find the current translation status in [TRANSLATION.md](https://github.c
 
 **To use this tool, you need to install Git(>=2.25.1) first.**
 
-You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [Github Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
+You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [GitHub Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
 
 This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationData}/SourceGit"`, which is platform-dependent, to store user settings, downloaded avatars and crash logs.
 
@@ -93,7 +93,7 @@ For **macOS** users:
   brew tap ybeapps/homebrew-sourcegit
   brew install --cask --no-quarantine sourcegit
   ```
-* If you want to install `SourceGit.app` from Github Release manually, you need run following command to make sure it works:
+* If you want to install `SourceGit.app` from GitHub Release manually, you need run following command to make sure it works:
   ```shell
   sudo xattr -cr /Applications/SourceGit.app
   ```

TRANSLATION.md

@@ -6,11 +6,12 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-96.50%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-96.38%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
+- Text.Avatar.Load
 - Text.BranchCM.ResetToSelectedCommit
 - Text.CommitDetail.Changes.Count
 - Text.CreateBranch.OverwriteExisting
@@ -42,13 +43,21 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.88%25-yellow)
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-92.38%25-yellow)
+<details>
+<summary>Missing keys in es_ES.axaml</summary>
+
+- Text.Avatar.Load
+
+</details>
+
+### ![fr__FR](https://img.shields.io/badge/fr__FR-92.26%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
+- Text.Avatar.Load
 - Text.Bisect
 - Text.Bisect.Abort
 - Text.Bisect.Bad
@@ -113,11 +122,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-97.75%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-97.63%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
+- Text.Avatar.Load
 - Text.BranchCM.ResetToSelectedCommit
 - Text.CommitDetail.Changes.Count
 - Text.CreateBranch.OverwriteExisting
@@ -144,6 +154,7 @@ This document shows the translation status of each locale file in the repository
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
+- Text.Avatar.Load
 - Text.Bisect
 - Text.Bisect.Abort
 - Text.Bisect.Bad
@@ -185,7 +196,6 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.FilterCommits
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
-- Text.Repository.Tags.OrderByNameDes
 - Text.Repository.ViewLogs
 - Text.Repository.Visit
 - Text.ResetWithoutCheckout
@@ -222,6 +232,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ApplyStash.DropAfterApply
 - Text.ApplyStash.RestoreIndex
 - Text.ApplyStash.Stash
+- Text.Avatar.Load
 - Text.Bisect
 - Text.Bisect.Abort
 - Text.Bisect.Bad
@@ -308,8 +319,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.ShowSubmodulesAsTree
 - Text.Repository.Skip
 - Text.Repository.Tags.OrderByCreatorDate
-- Text.Repository.Tags.OrderByNameAsc
-- Text.Repository.Tags.OrderByNameDes
+- Text.Repository.Tags.OrderByName
 - Text.Repository.Tags.Sort
 - Text.Repository.UseRelativeTimeInHistories
 - Text.Repository.ViewLogs
@@ -347,22 +357,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.63%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.BranchCM.CompareWithCurrent
-- Text.Repository.ClearStashes
-- Text.WorkingCopy.ResetAuthor
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-92.26%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-92.13%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
 
+- Text.Avatar.Load
 - Text.Bisect
 - Text.Bisect.Abort
 - Text.Bisect.Bad
@@ -428,11 +430,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-93.51%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-93.38%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
 
+- Text.Avatar.Load
 - Text.Bisect
 - Text.Bisect.Abort
 - Text.Bisect.Bad

VERSION

@@ -1 +1 @@
-2025.20
+2025.21

build/README.md

@@ -12,4 +12,4 @@
 dotnet publish -c Release -r $RUNTIME_IDENTIFIER -o $DESTINATION_FOLDER src/SourceGit.csproj
 ```
 > [!NOTE]
-> Please replace the `$RUNTIME_IDENTIFIER` with one of `win-x64`,`win-arm64`,`linux-x64`,`linux-arm64`,`osx-x64`,`osx-arm64`, and replece the `$DESTINATION_FOLDER` with the real path that will store the output executable files.
+> Please replace the `$RUNTIME_IDENTIFIER` with one of `win-x64`,`win-arm64`,`linux-x64`,`linux-arm64`,`osx-x64`,`osx-arm64`, and replace the `$DESTINATION_FOLDER` with the real path that will store the output executable files.

src/App.axaml.cs

@@ -338,7 +338,7 @@ public static IStorageProvider GetStorageProvider()
             return null;
         }
 
-        public static ViewModels.Launcher GetLauncer()
+        public static ViewModels.Launcher GetLauncher()
         {
             return Current is App app ? app._launcher : null;
         }

src/App.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <!-- This manifest is used on Windows only.
-       Don't remove it as it might cause problems with window transparency and embeded controls.
+       Don't remove it as it might cause problems with window transparency and embedded controls.
        For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
   <assemblyIdentity version="1.0.0.0" name="SourceGit.Desktop"/>
 

src/Commands/Blame.cs

@@ -89,7 +89,7 @@ private void ParseLine(string line)
 
         private readonly Models.BlameData _result = new Models.BlameData();
         private readonly StringBuilder _content = new StringBuilder();
-        private readonly string _dateFormat = Models.DateTimeFormat.Actived.DateOnly;
+        private readonly string _dateFormat = Models.DateTimeFormat.Active.DateOnly;
         private string _lastSHA = string.Empty;
         private bool _needUnifyCommitSHA = false;
         private int _minSHALen = 64;

src/Commands/MergeTool.cs

@@ -24,7 +24,7 @@ public static bool OpenForMerge(string repo, int toolType, string toolPath, stri
 
             if (!File.Exists(toolPath))
             {
-                Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT found external merge tool in '{toolPath}'!"));
+                Dispatcher.UIThread.Post(() => App.RaiseException(repo, $"Can NOT find external merge tool in '{toolPath}'!"));
                 return false;
             }
 
@@ -54,7 +54,7 @@ public static bool OpenForDiff(string repo, int toolType, string toolPath, Model
 
             if (!File.Exists(toolPath))
             {
-                Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT found external diff tool in '{toolPath}'!"));
+                Dispatcher.UIThread.Invoke(() => App.RaiseException(repo, $"Can NOT find external diff tool in '{toolPath}'!"));
                 return false;
             }
 

src/Commands/QueryFileContent.cs

@@ -35,5 +35,39 @@ public static Stream Run(string repo, string revision, string file)
 
             return stream;
         }
+
+        public static Stream FromLFS(string repo, string oid, long size)
+        {
+            var starter = new ProcessStartInfo();
+            starter.WorkingDirectory = repo;
+            starter.FileName = Native.OS.GitExecutable;
+            starter.Arguments = $"lfs smudge";
+            starter.UseShellExecute = false;
+            starter.CreateNoWindow = true;
+            starter.WindowStyle = ProcessWindowStyle.Hidden;
+            starter.RedirectStandardInput = true;
+            starter.RedirectStandardOutput = true;
+
+            var stream = new MemoryStream();
+            try
+            {
+                var proc = new Process() { StartInfo = starter };
+                proc.Start();
+                proc.StandardInput.WriteLine("version https://git-lfs.github.com/spec/v1");
+                proc.StandardInput.WriteLine($"oid sha256:{oid}");
+                proc.StandardInput.WriteLine($"size {size}");
+                proc.StandardOutput.BaseStream.CopyTo(stream);
+                proc.WaitForExit();
+                proc.Close();
+
+                stream.Position = 0;
+            }
+            catch (Exception e)
+            {
+                App.RaiseException(repo, $"Failed to query file content: {e}");
+            }
+
+            return stream;
+        }
     }
 }

src/Commands/SaveRevisionFile.cs

@@ -13,20 +13,16 @@ public static void Run(string repo, string revision, string file, string saveTo)
             var isLFSFiltered = new IsLFSFiltered(repo, revision, file).Result();
             if (isLFSFiltered)
             {
-                var tmpFile = saveTo + ".tmp";
-                if (ExecCmd(repo, $"show {revision}:\"{file}\"", tmpFile))
-                {
-                    ExecCmd(repo, $"lfs smudge", saveTo, tmpFile);
-                }
-                File.Delete(tmpFile);
+                var pointerStream = QueryFileContent.Run(repo, revision, file);
+                ExecCmd(repo, $"lfs smudge", saveTo, pointerStream);
             }
             else
             {
                 ExecCmd(repo, $"show {revision}:\"{file}\"", saveTo);
             }
         }
 
-        private static bool ExecCmd(string repo, string args, string outputFile, string inputFile = null)
+        private static bool ExecCmd(string repo, string args, string outputFile, Stream input = null)
         {
             var starter = new ProcessStartInfo();
             starter.WorkingDirectory = repo;
@@ -45,21 +41,8 @@ private static bool ExecCmd(string repo, string args, string outputFile, string
                 {
                     var proc = new Process() { StartInfo = starter };
                     proc.Start();
-
-                    if (inputFile != null)
-                    {
-                        using (StreamReader sr = new StreamReader(inputFile))
-                        {
-                            while (true)
-                            {
-                                var line = sr.ReadLine();
-                                if (line == null)
-                                    break;
-                                proc.StandardInput.WriteLine(line);
-                            }
-                        }
-                    }
-
+                    if (input != null)
+                        proc.StandardInput.Write(new StreamReader(input).ReadToEnd());
                     proc.StandardOutput.BaseStream.CopyTo(sw);
                     proc.WaitForExit();
                     var rs = proc.ExitCode == 0;

src/Converters/ObjectConverters.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace SourceGit.Converters
+{
+    public static class ObjectConverters
+    {
+        public class IsTypeOfConverter : IValueConverter
+        {
+            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                if (value == null || parameter == null)
+                    return false;
+
+                return value.GetType().IsAssignableTo((Type)parameter);
+            }
+
+            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                return new NotImplementedException();
+            }
+        }
+
+        public static readonly IsTypeOfConverter IsTypeOf = new IsTypeOfConverter();
+    }
+}

src/Models/AvatarManager.cs

@@ -17,7 +17,7 @@ namespace SourceGit.Models
 {
     public interface IAvatarHost
     {
-        void OnAvatarResourceChanged(string email);
+        void OnAvatarResourceChanged(string email, Bitmap image);
     }
 
     public partial class AvatarManager
@@ -119,7 +119,7 @@ public void Start()
                     Dispatcher.UIThread.InvokeAsync(() =>
                     {
                         _resources[email] = img;
-                        NotifyResourceChanged(email);
+                        NotifyResourceChanged(email, img);
                     });
                 }
 
@@ -151,7 +151,7 @@ public Bitmap Request(string email, bool forceRefetch)
                 if (File.Exists(localFile))
                     File.Delete(localFile);
 
-                NotifyResourceChanged(email);
+                NotifyResourceChanged(email, null);
             }
             else
             {
@@ -186,6 +186,37 @@ public Bitmap Request(string email, bool forceRefetch)
             return null;
         }
 
+        public void SetFromLocal(string email, string file)
+        {
+            try
+            {
+                Bitmap image = null;
+
+                using (var stream = File.OpenRead(file))
+                {
+                    image = Bitmap.DecodeToWidth(stream, 128);
+                }
+
+                if (image == null)
+                    return;
+
+                if (_resources.ContainsKey(email))
+                    _resources[email] = image;
+                else
+                    _resources.Add(email, image);
+
+                _requesting.Remove(email);
+
+                var store = Path.Combine(_storePath, GetEmailHash(email));
+                File.Copy(file, store, true);
+                NotifyResourceChanged(email, image);
+            }
+            catch
+            {
+                // ignore
+            }
+        }
+
         private void LoadDefaultAvatar(string key, string img)
         {
             var icon = AssetLoader.Open(new Uri($"avares://SourceGit/Resources/Images/{img}", UriKind.RelativeOrAbsolute));
@@ -203,12 +234,10 @@ private string GetEmailHash(string email)
             return builder.ToString();
         }
 
-        private void NotifyResourceChanged(string email)
+        private void NotifyResourceChanged(string email, Bitmap image)
         {
             foreach (var avatar in _avatars)
-            {
-                avatar.OnAvatarResourceChanged(email);
-            }
+                avatar.OnAvatarResourceChanged(email, image);
         }
     }
 }