Merge branch 'release/v2025.01'

Author: love-linger

README.md

@@ -47,7 +47,10 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-100.00%25-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-95.00%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-95.56%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-96.81%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.86%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-94.87%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-95.42%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-96.67%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
+
+> [!NOTE]
+> You can find the missing keys in [TRANSLATION.md](TRANSLATION.md)
 
 ## How to Use
 
@@ -64,7 +67,8 @@ This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationD
 | macOS   | `${HOME}/Library/Application Support/SourceGit`     |
 
 > [!TIP]
-> You can open this data storage directory from the main menu.
+> * You can open this data storage directory from the main menu `Open Data Storage Directory`.
+> * You can create a `data` folder next to the `SourceGit` executable to force this app to store data (user settings, downloaded avatars and crash logs) into it (Portable-Mode). Only works on Windows.
 
 For **Windows** users:
 
@@ -81,7 +85,6 @@ For **Windows** users:
   scoop install sourcegit
   ```
 * Pre-built binaries can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest)
-* You can run `dotnet publish -c Release -r win-x64 -p:EnablePortable=true -o $YOUR_PUBLISH_DIR .\src\SourceGit.csproj` to build a portable version.
 
 For **macOS** users:
 
@@ -190,6 +193,15 @@ This app supports open repository in external tools listed in the table below.
 
 Everyone is welcome to submit a PR. Please make sure your PR is based on the latest `develop` branch and the target branch of PR is `develop`.
 
+In short, here are the commands to get started once [.NET tools are installed](https://dotnet.microsoft.com/en-us/download):
+
+```sh
+dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org
+dotnet restore
+dotnet build
+dotnet run --project src/SourceGit.csproj
+```
+
 Thanks to all the people who contribute.
 
 [![Contributors](https://contrib.rocks/image?repo=sourcegit-scm/sourcegit&columns=20)](https://github.com/sourcegit-scm/sourcegit/graphs/contributors)

TRANSLATION.md

@@ -1,24 +1,24 @@
-### de_DE.axaml: 100.00%
+### de_DE.axaml: 99.86%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Preference.General.DateFormat
 
 </details>
 
-### es_ES.axaml: 100.00%
+### es_ES.axaml: 99.86%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Preference.General.DateFormat
 
 </details>
 
-### fr_FR.axaml: 95.00%
+### fr_FR.axaml: 94.87%
 
 
 <details>
@@ -47,6 +47,7 @@
 - Text.Preference.Appearance.FontSize
 - Text.Preference.Appearance.FontSize.Default
 - Text.Preference.Appearance.FontSize.Editor
+- Text.Preference.General.DateFormat
 - Text.Preference.General.ShowChildren
 - Text.Repository.CustomActions
 - Text.Repository.FilterCommits
@@ -63,7 +64,7 @@
 
 </details>
 
-### it_IT.axaml: 95.56%
+### it_IT.axaml: 95.42%
 
 
 <details>
@@ -89,6 +90,7 @@
 - Text.MergeMultiple.CommitChanges
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
+- Text.Preference.General.DateFormat
 - Text.Preference.General.ShowChildren
 - Text.Repository.FilterCommits
 - Text.Repository.FilterCommits.Default
@@ -104,7 +106,7 @@
 
 </details>
 
-### pt_BR.axaml: 96.81%
+### pt_BR.axaml: 96.67%
 
 
 <details>
@@ -128,6 +130,7 @@
 - Text.MergeMultiple.CommitChanges
 - Text.MergeMultiple.Strategy
 - Text.MergeMultiple.Targets
+- Text.Preference.General.DateFormat
 - Text.Preference.General.ShowChildren
 - Text.Repository.FilterCommits
 - Text.Repository.Skip

VERSION

@@ -1 +1 @@
-8.45
+2025.01

src/Commands/Blame.cs

@@ -65,7 +65,7 @@ protected override void OnReadline(string line)
             var commit = match.Groups[1].Value;
             var author = match.Groups[2].Value;
             var timestamp = int.Parse(match.Groups[3].Value);
-            var when = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime().ToString("yyyy/MM/dd");
+            var when = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime().ToString(_dateFormat);
 
             var info = new Models.BlameLineInfo()
             {
@@ -87,6 +87,7 @@ protected override void OnReadline(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 string _lastSHA = string.Empty;
         private bool _needUnifyCommitSHA = false;
         private int _minSHALen = 64;

src/Commands/ExecuteCustomAction.cs

@@ -53,6 +53,16 @@ public static void Run(string repo, string file, string args, Action<string> out
                 proc.BeginOutputReadLine();
                 proc.BeginErrorReadLine();
                 proc.WaitForExit();
+
+                var exitCode = proc.ExitCode;
+                if (exitCode != 0)
+                {
+                    var errMsg = builder.ToString();
+                    Dispatcher.UIThread.Invoke(() =>
+                    {
+                        App.RaiseException(repo, errMsg);
+                    });
+                }
             }
             catch (Exception e)
             {
@@ -62,17 +72,7 @@ public static void Run(string repo, string file, string args, Action<string> out
                 });
             }
 
-            var exitCode = proc.ExitCode;
             proc.Close();
-
-            if (exitCode != 0)
-            {
-                var errMsg = builder.ToString();
-                Dispatcher.UIThread.Invoke(() =>
-                {
-                    App.RaiseException(repo, errMsg);
-                });
-            }
         }
     }
 }

src/Models/Commit.cs

@@ -31,9 +31,9 @@ public static double OpacityForNotMerged
         public List<Decorator> Decorators { get; set; } = new List<Decorator>();
         public bool HasDecorators => Decorators.Count > 0;
 
-        public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
-        public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
-        public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd");
+        public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
+        public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
+        public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString(DateTimeFormat.Actived.DateOnly);
 
         public bool IsMerged { get; set; } = false;
         public bool IsCommitterVisible => !Author.Equals(Committer) || AuthorTime != CommitterTime;

src/Models/DateTimeFormat.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+
+namespace SourceGit.Models
+{
+    public class DateTimeFormat
+    {
+        public string DateOnly { get; set; }
+        public string DateTime { get; set; }
+
+        public string Example
+        {
+            get => _example.ToString(DateTime);
+        }
+
+        public DateTimeFormat(string dateOnly, string dateTime)
+        {
+            DateOnly = dateOnly;
+            DateTime = dateTime;
+        }
+
+        public static int ActiveIndex
+        {
+            get;
+            set;
+        } = 0;
+
+        public static DateTimeFormat Actived
+        {
+            get => Supported[ActiveIndex];
+        }
+
+        public static readonly List<DateTimeFormat> Supported = new List<DateTimeFormat>
+        {
+            new DateTimeFormat("yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss"),
+            new DateTimeFormat("yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss"),
+            new DateTimeFormat("yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss"),
+            new DateTimeFormat("MM/dd/yyyy", "MM/dd/yyyy HH:mm:ss"),
+            new DateTimeFormat("MM.dd.yyyy", "MM.dd.yyyy HH:mm:ss"),
+            new DateTimeFormat("MM-dd-yyyy", "MM-dd-yyyy HH:mm:ss"),
+            new DateTimeFormat("dd/MM/yyyy", "dd/MM/yyyy HH:mm:ss"),
+            new DateTimeFormat("dd.MM.yyyy", "dd.MM.yyyy HH:mm:ss"),
+            new DateTimeFormat("dd-MM-yyyy", "dd-MM-yyyy HH:mm:ss"),
+            new DateTimeFormat("MMM d yyyy", "MMM d yyyy HH:mm:ss"),
+            new DateTimeFormat("d MMM yyyy", "d MMM yyyy HH:mm:ss"),
+        };
+
+        private static readonly DateTime _example = new DateTime(2025, 1, 31, 8, 0, 0, DateTimeKind.Local);
+    }
+}

src/Models/Stash.cs

@@ -9,6 +9,6 @@ public class Stash
         public ulong Time { get; set; } = 0;
         public string Message { get; set; } = "";
 
-        public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
+        public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString(DateTimeFormat.Actived.DateTime);
     }
 }

src/Native/MacOS.cs

@@ -25,7 +25,12 @@ public void SetupApp(AppBuilder builder)
 
         public string FindGitExecutable()
         {
-            return File.Exists("/usr/bin/git") ? "/usr/bin/git" : string.Empty;
+            var gitPathVariants = new List<string>() {
+                 "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" 
+            };
+            foreach (var path in gitPathVariants)
+                if (File.Exists(path)) return path;
+            return string.Empty;
         }
 
         public string FindTerminal(Models.ShellOrTerminal shell)

src/Native/OS.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-#if ENABLE_PORTABLE
 using System.Diagnostics;
-#endif
 using System.IO;
 
 using Avalonia;
@@ -58,16 +56,17 @@ public static void SetupApp(AppBuilder builder)
 
         public static void SetupDataDir()
         {
-#if ENABLE_PORTABLE
             if (OperatingSystem.IsWindows())
             {
                 var execFile = Process.GetCurrentProcess().MainModule!.FileName;
-                DataDir = Path.Combine(Path.GetDirectoryName(execFile), "data");
-                if (!Directory.Exists(DataDir))
-                    Directory.CreateDirectory(DataDir);
-                return;
+                var portableDir = Path.Combine(Path.GetDirectoryName(execFile), "data");
+                if (Directory.Exists(portableDir))
+                {
+                    DataDir = portableDir;
+                    return;
+                }
             }
-#endif
+
             var osAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             if (string.IsNullOrEmpty(osAppDataDir))
                 DataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".sourcegit");

src/Resources/Locales/en_US.axaml

@@ -465,6 +465,7 @@
   <x:String x:Key="Text.Preference.DiffMerge.Type" xml:space="preserve">Tool</x:String>
   <x:String x:Key="Text.Preference.General" xml:space="preserve">GENERAL</x:String>
   <x:String x:Key="Text.Preference.General.Check4UpdatesOnStartup" xml:space="preserve">Check for updates on startup</x:String>
+  <x:String x:Key="Text.Preference.General.DateFormat" xml:space="preserve">Date Format</x:String>
   <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Language</x:String>
   <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
   <x:String x:Key="Text.Preference.General.ShowAuthorTime" xml:space="preserve">Show author time instead of commit time in graph</x:String>