mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-06 16:58:49 +01:00
🎨 Improve data snapshot comparison https://github.com/siyuan-note/siyuan/issues/8081
This commit is contained in:
parent
fd0092fb21
commit
3a7cee3f9d
2 changed files with 17 additions and 17 deletions
|
|
@ -175,6 +175,22 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
|
|||
},
|
||||
}
|
||||
luteEngine := NewLute()
|
||||
for _, removeRight := range diff.RemovesRight {
|
||||
title, parseErr := parseTitleInSnapshot(removeRight.ID, repo, luteEngine)
|
||||
if "" == title || nil != parseErr {
|
||||
continue
|
||||
}
|
||||
|
||||
ret.RemovesRight = append(ret.RemovesRight, &DiffFile{
|
||||
FileID: removeRight.ID,
|
||||
Title: title,
|
||||
Updated: removeRight.Updated,
|
||||
})
|
||||
}
|
||||
if 1 > len(ret.RemovesRight) {
|
||||
ret.RemovesRight = []*DiffFile{}
|
||||
}
|
||||
|
||||
for _, addLeft := range diff.AddsLeft {
|
||||
title, parseErr := parseTitleInSnapshot(addLeft.ID, repo, luteEngine)
|
||||
if "" == title || nil != parseErr {
|
||||
|
|
@ -222,22 +238,6 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
|
|||
if 1 > len(ret.UpdatesRight) {
|
||||
ret.UpdatesRight = []*DiffFile{}
|
||||
}
|
||||
|
||||
for _, removeRight := range diff.RemovesRight {
|
||||
title, parseErr := parseTitleInSnapshot(removeRight.ID, repo, luteEngine)
|
||||
if "" == title || nil != parseErr {
|
||||
continue
|
||||
}
|
||||
|
||||
ret.RemovesRight = append(ret.RemovesRight, &DiffFile{
|
||||
FileID: removeRight.ID,
|
||||
Title: title,
|
||||
Updated: removeRight.Updated,
|
||||
})
|
||||
}
|
||||
if 1 > len(ret.RemovesRight) {
|
||||
ret.RemovesRight = []*DiffFile{}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue