Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 16:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve data snapshot comparison https://github.com/siyuan-note/siyuan/issues/8081

Browse source
This commit is contained in:
Liang Ding 2023-04-22 18:28:15 +08:00
parent 4c02f211b5
commit 0dcca1ec23
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

41
kernel/model/repository.go
View file

@ -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,14 +176,15 @@ 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) {
@ -190,14 +192,15 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
}
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) {
@ -205,14 +208,15 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
}
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) {
@ -220,14 +224,15 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
}
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) {