refactor: commits only hold the end position of subject in body

love-linger · love-linger · commit b4e01a8b9352 · 2024-06-06T20:59:09.000+08:00
diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
@@ -57,17 +57,18 @@ protected override void OnReadline(string line)
                     if (line.Equals(_endOfBodyToken, StringComparison.Ordinal))
                     {
                         _nextPartIdx = 0;
-                        _current.Message = _messageReader.ToString().Trim();
-                        _messageReader.Clear();
-                    }
-                    else if (!_isSubjectSet)
-                    {
-                        _isSubjectSet = true;
-                        _current.Subject = line;
+                        _current.Body = _bodyReader.ToString().TrimEnd();
+                        _bodyReader.Clear();
                     }
                     else
                     {
-                        _messageReader.AppendLine(line);
+                        if (!_isSubjectSet)
+                        {
+                            _isSubjectSet = true;
+                            _current.SubjectLen = line.Length;
+                        }
+
+                        _bodyReader.AppendLine(line);
                     }
                     return;
             }
@@ -191,9 +192,9 @@ private void MarkFirstMerged()
         private List<Models.Commit> _commits = new List<Models.Commit>();
         private Models.Commit _current = null;
         private bool _isHeadFounded = false;
-        private readonly bool _findFirstMerged = true;
+        private bool _findFirstMerged = true;
         private int _nextPartIdx = 0;
         private bool _isSubjectSet = false;
-        private StringBuilder _messageReader = new StringBuilder();
+        private StringBuilder _bodyReader = new StringBuilder();
     }
 }
diff --git a/src/Commands/QuerySingleCommit.cs b/src/Commands/QuerySingleCommit.cs
@@ -32,15 +32,12 @@ public Models.Commit Result()
                 commit.AuthorTime = ulong.Parse(lines[4]);
                 commit.Committer = Models.User.FindOrAdd(lines[5]);
                 commit.CommitterTime = ulong.Parse(lines[6]);
-                commit.Subject = lines[7];
+                commit.SubjectLen = lines[7].Length;
 
-                if (lines.Length > 8)
-                {
-                    StringBuilder builder = new StringBuilder();
-                    for (int i = 8; i < lines.Length; i++)
-                        builder.Append(lines[i]);
-                    commit.Message = builder.ToString();
-                }
+                StringBuilder builder = new StringBuilder();
+                for (int i = 7; i < lines.Length; i++)
+                    builder.AppendLine(lines[i]);
+                commit.Body = builder.ToString().TrimEnd();
 
                 return commit;
             }
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
@@ -12,33 +12,22 @@ public class Commit
         public ulong AuthorTime { get; set; } = 0;
         public User Committer { get; set; } = User.Invalid;
         public ulong CommitterTime { get; set; } = 0;
-        public string Subject { get; set; } = string.Empty;
-        public string Message { get; set; } = string.Empty;
+        public int SubjectLen { get; set; } = 0;
+        public string Body { get; set; } = string.Empty;
         public List<string> Parents { get; set; } = new List<string>();
         public List<Decorator> Decorators { get; set; } = new List<Decorator>();
         public bool HasDecorators => Decorators.Count > 0;
         public bool IsMerged { get; set; } = false;
         public Thickness Margin { get; set; } = new Thickness(0);
 
+        public string Subject => string.IsNullOrWhiteSpace(Body) ? string.Empty : Body.Substring(0, SubjectLen);
         public string AuthorTimeStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd HH:mm:ss");
         public string CommitterTimeStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd HH:mm:ss");
         public string AuthorTimeShortStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd");
         public string CommitterTimeShortStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd");
 
-        public bool IsCommitterVisible
-        {
-            get => Author != Committer || AuthorTime != CommitterTime;
-        }
-
-        public bool IsCurrentHead
-        {
-            get => Decorators.Find(x => x.Type is DecoratorType.CurrentBranchHead or DecoratorType.CurrentCommitHead) != null;
-        }
-
-        public string FullMessage
-        {
-            get => string.IsNullOrWhiteSpace(Message) ? Subject : $"{Subject}\n\n{Message}";
-        }
+        public bool IsCommitterVisible => Author != Committer || AuthorTime != CommitterTime;
+        public bool IsCurrentHead => Decorators.Find(x => x.Type is DecoratorType.CurrentBranchHead or DecoratorType.CurrentCommitHead) != null;
 
         private static readonly DateTime _utcStart = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime();
     }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -419,8 +419,7 @@ public void StartSearchCommits()
             foreach (var c in _histories.Commits)
             {
                 if (c.SHA.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
-                    || c.Subject.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
-                    || c.Message.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
+                    || c.Body.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
                     || c.Author.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
                     || c.Committer.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
                     || c.Author.Email.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)
diff --git a/src/ViewModels/Reword.cs b/src/ViewModels/Reword.cs
@@ -22,13 +22,13 @@ public Reword(Repository repo, Models.Commit head)
         {
             _repo = repo;
             Head = head;
-            Message = head.FullMessage;
+            Message = head.Body;
             View = new Views.Reword() { DataContext = this };
         }
 
         public override Task<bool> Sure()
         {
-            if (_message == Head.FullMessage)
+            if (_message == Head.Body)
                 return null;
 
             _repo.SetWatcherEnabled(false);
diff --git a/src/ViewModels/Squash.cs b/src/ViewModels/Squash.cs
@@ -27,7 +27,7 @@ public string Message
         public Squash(Repository repo, Models.Commit head, Models.Commit parent)
         {
             _repo = repo;
-            _message = parent.FullMessage;
+            _message = parent.Body;
             Head = head;
             Parent = parent;
             View = new Views.Squash() { DataContext = this };
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -93,7 +93,7 @@ public bool UseAmend
                     }
                     else
                     {
-                        CommitMessage = commits[0].FullMessage;
+                        CommitMessage = commits[0].Body;
                     }
                 }
 
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
@@ -104,7 +104,7 @@
           <!-- Messages -->
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Message}" VerticalAlignment="Top" Margin="0,4,0,0" />
           <ScrollViewer Grid.Row="3" Grid.Column="1" Margin="12,5,8,0" MaxHeight="64" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-            <SelectableTextBlock Text="{Binding FullMessage}" FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont}" TextWrapping="Wrap"/>
+            <SelectableTextBlock Text="{Binding Body}" FontFamily="{Binding Source={x:Static vm:Preference.Instance}, Path=MonospaceFont}" TextWrapping="Wrap"/>
           </ScrollViewer>
         </Grid>
       </StackPanel>

Original file line number	Diff line number	Diff line change
`@@ -57,17 +57,18 @@ protected override void OnReadline(string line)`
`57`	`57`	`if (line.Equals(_endOfBodyToken, StringComparison.Ordinal))`
`58`	`58`	`{`
`59`	`59`	`_nextPartIdx = 0;`
`60`		`- _current.Message = _messageReader.ToString().Trim();`
`61`		`- _messageReader.Clear();`
`62`		`- }`
`63`		`- else if (!_isSubjectSet)`
`64`		`- {`
`65`		`- _isSubjectSet = true;`
`66`		`- _current.Subject = line;`
	`60`	`+ _current.Body = _bodyReader.ToString().TrimEnd();`
	`61`	`+ _bodyReader.Clear();`
`67`	`62`	`}`
`68`	`63`	`else`
`69`	`64`	`{`
`70`		`- _messageReader.AppendLine(line);`
	`65`	`+ if (!_isSubjectSet)`
	`66`	`+ {`
	`67`	`+ _isSubjectSet = true;`
	`68`	`+ _current.SubjectLen = line.Length;`
	`69`	`+ }`
	`70`	`+`
	`71`	`+ _bodyReader.AppendLine(line);`
`71`	`72`	`}`
`72`	`73`	`return;`
`73`	`74`	`}`
`@@ -191,9 +192,9 @@ private void MarkFirstMerged()`
`191`	`192`	`private List<Models.Commit> _commits = new List<Models.Commit>();`
`192`	`193`	`private Models.Commit _current = null;`
`193`	`194`	`private bool _isHeadFounded = false;`
`194`		`- private readonly bool _findFirstMerged = true;`
	`195`	`+ private bool _findFirstMerged = true;`
`195`	`196`	`private int _nextPartIdx = 0;`
`196`	`197`	`private bool _isSubjectSet = false;`
`197`		`- private StringBuilder _messageReader = new StringBuilder();`
	`198`	`+ private StringBuilder _bodyReader = new StringBuilder();`
`198`	`199`	`}`
`199`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ public Reword(Repository repo, Models.Commit head)`
`22`	`22`	`{`
`23`	`23`	`_repo = repo;`
`24`	`24`	`Head = head;`
`25`		`- Message = head.FullMessage;`
	`25`	`+ Message = head.Body;`
`26`	`26`	`View = new Views.Reword() { DataContext = this };`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public override Task<bool> Sure()`
`30`	`30`	`{`
`31`		`- if (_message == Head.FullMessage)`
	`31`	`+ if (_message == Head.Body)`
`32`	`32`	`return null;`
`33`	`33`
`34`	`34`	`_repo.SetWatcherEnabled(false);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public string Message`
`27`	`27`	`public Squash(Repository repo, Models.Commit head, Models.Commit parent)`
`28`	`28`	`{`
`29`	`29`	`_repo = repo;`
`30`		`- _message = parent.FullMessage;`
	`30`	`+ _message = parent.Body;`
`31`	`31`	`Head = head;`
`32`	`32`	`Parent = parent;`
`33`	`33`	`View = new Views.Squash() { DataContext = this };`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public bool UseAmend`
`93`	`93`	`}`
`94`	`94`	`else`
`95`	`95`	`{`
`96`		`- CommitMessage = commits[0].FullMessage;`
	`96`	`+ CommitMessage = commits[0].Body;`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`