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

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

Browse source
This commit is contained in:
Vanessa 2022-12-12 22:35:26 +08:00
commit 2d2a3c76fd
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kernel/model/storage.go
View file

@ -17,14 +17,15 @@
package model
import (
"github.com/88250/lute/parse"
"os"
"path/filepath"
"sync"
"github.com/88250/gulu"
"github.com/88250/lute/parse"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
)
@ -79,17 +80,14 @@ func SetRecentDoc(doc *RecentDoc) (err error) {
return
}
update := false
for i, c := range recentDocs {
if c.RootID == doc.RootID {
recentDocs[i] = doc
update = true
recentDocs = append(recentDocs[:i], recentDocs[i+1:]...)
break
}
}
if !update {
recentDocs = append([]*RecentDoc{doc}, recentDocs...)
}
recentDocs = append([]*RecentDoc{doc}, recentDocs...)
if 32 < len(recentDocs) {
recentDocs = recentDocs[:32]
}
@ -127,7 +125,7 @@ func setRecentDocs(recentDocs []*RecentDoc) (err error) {
}
func getRecentDocs() (ret []*RecentDoc, err error) {
ret = []*RecentDoc{}
tmp := []*RecentDoc{}
dataPath := filepath.Join(util.DataDir, "storage/recent-doc.json")
if !gulu.File.IsExist(dataPath) {
return
@ -139,10 +137,22 @@ func getRecentDocs() (ret []*RecentDoc, err error) {
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &tmp); nil != err {
logging.LogErrorf("unmarshal storage [recent-doc] failed: %s", err)
return
}
var notExists []string
for _, doc := range tmp {
if nil != treenode.GetBlockTree(doc.RootID) {
ret = append(ret, doc)
} else {
notExists = append(notExists, doc.RootID)
}
}
if 0 < len(notExists) {
setRecentDocs(ret)
}
return
}