Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 00:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 支持数据快照对比 https://github.com/siyuan-note/siyuan/issues/6858

Browse source
This commit is contained in:
Liang Ding 2022-12-17 17:51:30 +08:00
parent 3969a67c65
commit 93b015fbca
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/electron/main.js
View file

@ -459,7 +459,6 @@ const boot = () => {
resetTrayMenu() resetTrayMenu()
} }
const buildTrayMenuTemplate = () => { const buildTrayMenuTemplate = () => {
let ret = [ let ret = [
showWndMenu, showWndMenu,

47
kernel/model/repository.go
View file

@ -159,8 +159,7 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
luteEngine := NewLute() luteEngine := NewLute()
for _, addLeft := range diff.AddsLeft { for _, addLeft := range diff.AddsLeft {
title, err := parseTitleInSnapshot(addLeft.ID, repo, luteEngine) title, err := parseTitleInSnapshot(addLeft.ID, repo, luteEngine)
if nil != err { if "" == title || nil != err {
logging.LogErrorf("parse title from snapshot file [%s] failed", addLeft.ID)
continue continue
} }
@ -175,8 +174,7 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
for _, updateLeft := range diff.UpdatesLeft { for _, updateLeft := range diff.UpdatesLeft {
title, err := parseTitleInSnapshot(updateLeft.ID, repo, luteEngine) title, err := parseTitleInSnapshot(updateLeft.ID, repo, luteEngine)
if nil != err { if "" == title || nil != err {
logging.LogErrorf("parse title from snapshot file [%s] failed", updateLeft.ID)
continue continue
} }
@ -191,8 +189,7 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
for _, updateRight := range diff.UpdatesRight { for _, updateRight := range diff.UpdatesRight {
title, err := parseTitleInSnapshot(updateRight.ID, repo, luteEngine) title, err := parseTitleInSnapshot(updateRight.ID, repo, luteEngine)
if nil != err { if "" == title || nil != err {
logging.LogErrorf("parse title from snapshot file [%s] failed", updateRight.ID)
continue continue
} }
@ -207,8 +204,7 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
for _, removeRight := range diff.RemovesRight { for _, removeRight := range diff.RemovesRight {
title, err := parseTitleInSnapshot(removeRight.ID, repo, luteEngine) title, err := parseTitleInSnapshot(removeRight.ID, repo, luteEngine)
if nil != err { if "" == title || nil != err {
logging.LogErrorf("parse title from snapshot file [%s] failed", removeRight.ID)
continue continue
} }
@ -226,26 +222,29 @@ func DiffRepoSnapshots(left, right string) (ret *LeftRightDiff, err error) {
func parseTitleInSnapshot(fileID string, repo *dejavu.Repo, luteEngine *lute.Lute) (title string, err error) { func parseTitleInSnapshot(fileID string, repo *dejavu.Repo, luteEngine *lute.Lute) (title string, err error) {
file, err := repo.GetFile(fileID) file, err := repo.GetFile(fileID)
if nil != err { if nil != err {
logging.LogErrorf("get file [%s] failed: %s", fileID, err)
return return
} }
if strings.HasSuffix(file.Path, ".sy") { if !strings.HasSuffix(file.Path, ".sy") {
var data []byte return
data, err = repo.OpenFile(file)
if nil != err {
return
}
var tree *parse.Tree
tree, err = parse.ParseJSONWithoutFix(data, luteEngine.ParseOptions)
if nil != err {
return
}
title = tree.Root.IALAttr("title")
} else {
title = path.Base(file.Path)
} }
var data []byte
data, err = repo.OpenFile(file)
if nil != err {
logging.LogErrorf("open file [%s] failed: %s", fileID, err)
return
}
var tree *parse.Tree
tree, err = parse.ParseJSONWithoutFix(data, luteEngine.ParseOptions)
if nil != err {
logging.LogErrorf("parse file [%s] failed: %s", fileID, err)
return
}
title = tree.Root.IALAttr("title")
return return
} }