🎨 Improve data snapshot comparison #8081

siyuan-note · Apr 22, 2023 · 0dcca1e · 0dcca1e
1 parent 4c02f21
commit 0dcca1e
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
@@ -138,8 +138,9 @@ type LeftRightDiff struct {
 }
 
 type DiffFile struct {
-	FileID string `json:"fileID"`
-	Title  string `json:"title"`
+	FileID  string `json:"fileID"`
+	Title   string `json:"title"`
+	Updated int64  `json:"updated"`
 }
 
 type DiffIndex struct {
@@ -175,59 +176,63 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
 	}
 	luteEngine := NewLute()
 	for _, addLeft := range diff.AddsLeft {
-		title, err := parseTitleInSnapshot(addLeft.ID, repo, luteEngine)
-		if "" == title || nil != err {
+		title, parseErr := parseTitleInSnapshot(addLeft.ID, repo, luteEngine)
+		if "" == title || nil != parseErr {
 			continue
 		}
 
 		ret.AddsLeft = append(ret.AddsLeft, &DiffFile{
-			FileID: addLeft.ID,
-			Title:  title,
+			FileID:  addLeft.ID,
+			Title:   title,
+			Updated: addLeft.Updated,
 		})
 	}
 	if 1 > len(ret.AddsLeft) {
 		ret.AddsLeft = []*DiffFile{}
 	}
 
 	for _, updateLeft := range diff.UpdatesLeft {
-		title, err := parseTitleInSnapshot(updateLeft.ID, repo, luteEngine)
-		if "" == title || nil != err {
+		title, parseErr := parseTitleInSnapshot(updateLeft.ID, repo, luteEngine)
+		if "" == title || nil != parseErr {
 			continue
 		}
 
 		ret.UpdatesLeft = append(ret.UpdatesLeft, &DiffFile{
-			FileID: updateLeft.ID,
-			Title:  title,
+			FileID:  updateLeft.ID,
+			Title:   title,
+			Updated: updateLeft.Updated,
 		})
 	}
 	if 1 > len(ret.UpdatesLeft) {
 		ret.UpdatesLeft = []*DiffFile{}
 	}
 
 	for _, updateRight := range diff.UpdatesRight {
-		title, err := parseTitleInSnapshot(updateRight.ID, repo, luteEngine)
-		if "" == title || nil != err {
+		title, parseErr := parseTitleInSnapshot(updateRight.ID, repo, luteEngine)
+		if "" == title || nil != parseErr {
 			continue
 		}
 
 		ret.UpdatesRight = append(ret.UpdatesRight, &DiffFile{
-			FileID: updateRight.ID,
-			Title:  title,
+			FileID:  updateRight.ID,
+			Title:   title,
+			Updated: updateRight.Updated,
 		})
 	}
 	if 1 > len(ret.UpdatesRight) {
 		ret.UpdatesRight = []*DiffFile{}
 	}
 
 	for _, removeRight := range diff.RemovesRight {
-		title, err := parseTitleInSnapshot(removeRight.ID, repo, luteEngine)
-		if "" == title || nil != err {
+		title, parseErr := parseTitleInSnapshot(removeRight.ID, repo, luteEngine)
+		if "" == title || nil != parseErr {
 			continue
 		}
 
 		ret.RemovesRight = append(ret.RemovesRight, &DiffFile{
-			FileID: removeRight.ID,
-			Title:  title,
+			FileID:  removeRight.ID,
+			Title:   title,
+			Updated: removeRight.Updated,
 		})
 	}
 	if 1 > len(ret.RemovesRight) {