Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-04 03:40:15 +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-23 13:29:12 +08:00
parent fd0092fb21
commit 3a7cee3f9d
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/history/diff.ts
View file

@ -104,7 +104,7 @@ export const showDiff = (data: { id: string, time: string }[]) => {
}
let left: string;
let right: string;
if (data[0].time < data[1].time) {
if (data[0].time > data[1].time) {
left = data[1].id;
right = data[0].id;
} else {

32
kernel/model/repository.go
View file

@ -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
}