refactor: rewrite the way to format datetimes

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

Author: love-linger

src/Models/Blame.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace SourceGit.Models
 {
@@ -10,7 +9,6 @@ public class BlameLineInfo
         public string File { get; set; } = string.Empty;
         public string Author { get; set; } = string.Empty;
         public ulong Timestamp { get; set; } = 0;
-        public string Time => DateTime.UnixEpoch.AddSeconds(Timestamp).ToLocalTime().ToString(DateTimeFormat.Active.DateOnly);
     }
 
     public class BlameData

src/Models/DateTimeFormat.cs

@@ -5,72 +5,62 @@ namespace SourceGit.Models
 {
     public class DateTimeFormat
     {
-        public string DateOnly
+        public static readonly List<DateTimeFormat> Supported = new List<DateTimeFormat>
+        {
+            new("yyyy/MM/dd"),
+            new("yyyy.MM.dd"),
+            new("yyyy-MM-dd"),
+            new("MM/dd/yyyy"),
+            new("MM.dd.yyyy"),
+            new("MM-dd-yyyy"),
+            new("dd/MM/yyyy"),
+            new("dd.MM.yyyy"),
+            new("dd-MM-yyyy"),
+            new("MMM d yyyy"),
+            new("d MMM yyyy"),
+        };
+
+        public static int ActiveIndex
         {
             get;
             set;
-        }
+        } = 0;
 
-        public string DateTime
+        public static bool Use24Hours
         {
-            get
-            {
-                if (_use24Hours != Use24Hours || string.IsNullOrEmpty(_dateTime))
-                {
-                    _use24Hours = Use24Hours;
-                    _dateTime = _use24Hours ? $"{DateOnly} HH:mm:ss" : $"{DateOnly} hh:mm:ss tt";
-                }
+            get;
+            set;
+        } = true;
 
-                return _dateTime;
-            }
+        public string DateFormat
+        {
+            get;
         }
 
         public string Example
         {
-            get
-            {
-                return new DateTime(2025, 1, 31, 8, 0, 0, DateTimeKind.Local).ToString(DateOnly);
-            }
+            get => DateTime.Now.ToString(DateFormat);
         }
 
         public DateTimeFormat(string date)
         {
-            DateOnly = date;
+            DateFormat = date;
         }
 
-        public static int ActiveIndex
-        {
-            get;
-            set;
-        } = 0;
-
-        public static bool Use24Hours
-        {
-            get;
-            set;
-        } = true;
-
-        public static DateTimeFormat Active
+        public static string Format(ulong timestamp, bool dateOnly = false)
         {
-            get => Supported[ActiveIndex];
+            var localTime = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();
+            return Format(localTime, dateOnly);
         }
 
-        public static readonly List<DateTimeFormat> Supported = new List<DateTimeFormat>
+        public static string Format(DateTime localTime, bool dateOnly = false)
         {
-            new DateTimeFormat("yyyy/MM/dd"),
-            new DateTimeFormat("yyyy.MM.dd"),
-            new DateTimeFormat("yyyy-MM-dd"),
-            new DateTimeFormat("MM/dd/yyyy"),
-            new DateTimeFormat("MM.dd.yyyy"),
-            new DateTimeFormat("MM-dd-yyyy"),
-            new DateTimeFormat("dd/MM/yyyy"),
-            new DateTimeFormat("dd.MM.yyyy"),
-            new DateTimeFormat("dd-MM-yyyy"),
-            new DateTimeFormat("MMM d yyyy"),
-            new DateTimeFormat("d MMM yyyy"),
-        };
+            var actived = Supported[ActiveIndex];
+            if (dateOnly)
+                return localTime.ToString(actived.DateFormat);
 
-        private bool _use24Hours = true;
-        private string _dateTime = null;
+            var format = Use24Hours ? $"{actived.DateFormat} HH:mm:ss" : $"{actived.DateFormat} hh:mm:ss tt";
+            return localTime.ToString(format);
+        }
     }
 }

src/Models/SelfUpdate.cs

@@ -28,7 +28,7 @@ public class Version
         public bool IsNewVersion => CurrentVersion.CompareTo(new System.Version(TagName.Substring(1))) < 0;
 
         [JsonIgnore]
-        public string ReleaseDateStr => PublishedAt.ToString(DateTimeFormat.Active.DateOnly);
+        public string ReleaseDateStr => DateTimeFormat.Format(PublishedAt, true);
 
         public Version()
         {

src/Views/Blame.axaml.cs

@@ -79,8 +79,9 @@ public override void Render(DrawingContext context)
                         var authorTop = y - author.Height * 0.5;
                         context.DrawText(author, new Point(x, authorTop));
 
+                        var timeStr = Models.DateTimeFormat.Format(info.Timestamp);
                         var time = new FormattedText(
-                            info.Time,
+                            timeStr,
                             CultureInfo.CurrentCulture,
                             FlowDirection.LeftToRight,
                             typeface,
@@ -130,8 +131,9 @@ protected override Size MeasureOverride(Size availableSize)
                             _editor.Foreground);
                         x += author.Width + 8;
 
+                        var timeStr = Models.DateTimeFormat.Format(info.Timestamp);
                         var time = new FormattedText(
-                            info.Time,
+                            timeStr,
                             CultureInfo.CurrentCulture,
                             FlowDirection.LeftToRight,
                             typeface,

src/Views/CommitTimeTextBlock.cs

@@ -132,10 +132,7 @@ private string GetDisplayText()
 
             var timestamp = UseAuthorTime ? commit.AuthorTime : commit.CommitterTime;
             if (ShowAsDateTime)
-            {
-                var format = Models.DateTimeFormat.Active.DateTime;
-                return DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime().ToString(format);
-            }
+                return Models.DateTimeFormat.Format(timestamp);
 
             var now = DateTime.Now;
             var localTime = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();

src/Views/DateTimePresenter.cs

@@ -72,9 +72,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 change.Property == DateTimeFormatProperty ||
                 change.Property == TimestampProperty)
             {
-                var active = Models.DateTimeFormat.Active;
-                var format = ShowDateOnly ? active.DateOnly : active.DateTime;
-                var text = DateTime.UnixEpoch.AddSeconds(Timestamp).ToLocalTime().ToString(format);
+                var text = Models.DateTimeFormat.Format(Timestamp, ShowDateOnly);
                 SetCurrentValue(TextProperty, text);
             }
         }

src/Views/Preferences.axaml

@@ -74,7 +74,7 @@
                   <DataTemplate x:DataType="{x:Type m:DateTimeFormat}">
                     <Grid ColumnDefinitions="*,8,*">
                       <TextBlock Grid.Column="0" FontFamily="{DynamicResource Fonts.Monospace}" Text="{Binding Example}"/>
-                      <TextBlock Grid.Column="2" FontFamily="{DynamicResource Fonts.Monospace}" Text="{Binding DateOnly}" Foreground="{DynamicResource Brush.FG2}"/>
+                      <TextBlock Grid.Column="2" FontFamily="{DynamicResource Fonts.Monospace}" Text="{Binding DateFormat}" Foreground="{DynamicResource Brush.FG2}"/>
                     </Grid>
                   </DataTemplate>
                 </ComboBox.ItemTemplate>