0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-04-23 18:45:15 +08:00
commit 6d45b15ee3
2 changed files with 20 additions and 20 deletions
Show stats 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 {

38
kernel/model/repository.go
View file

@ -175,20 +175,36 @@ 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.AddsLeft = append(ret.AddsLeft, &DiffFile{
FileID: removeRight.ID,
Title: title,
Updated: removeRight.Updated,
})
}
if 1 > len(ret.AddsLeft) {
ret.AddsLeft = []*DiffFile{}
}
for _, addLeft := range diff.AddsLeft {
title, parseErr := parseTitleInSnapshot(addLeft.ID, repo, luteEngine)
if "" == title || nil != parseErr {
continue
}
ret.AddsLeft = append(ret.AddsLeft, &DiffFile{
ret.RemovesRight = append(ret.RemovesRight, &DiffFile{
FileID: addLeft.ID,
Title: title,
Updated: addLeft.Updated,
})
}
if 1 > len(ret.AddsLeft) {
ret.AddsLeft = []*DiffFile{}
if 1 > len(ret.RemovesRight) {
ret.RemovesRight = []*DiffFile{}
}
for _, updateLeft := range diff.UpdatesLeft {
@ -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
}