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

🎨 数据历史文档中支持操作类型过滤 https://github.com/siyuan-note/siyuan/issues/5754

Browse source
This commit is contained in:
Liang Ding 2022-08-30 00:24:54 +08:00
parent 72b3f151a6
commit a807e47d63
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/assets.go
View file

@ -419,6 +419,8 @@ func RemoveUnusedAssets() (ret []string) {
if 0 < len(ret) {
IncSync()
}
indexHistoryDir(filepath.Base(historyDir), NewLute())
return
}
@ -445,6 +447,8 @@ func RemoveUnusedAsset(p string) (ret string) {
}
ret = p
IncSync()
indexHistoryDir(filepath.Base(historyDir), NewLute())
return
}

1
kernel/model/file.go
View file

@ -1198,6 +1198,7 @@ func RemoveDoc(boxID, p string) (err error) {
return errors.New(fmt.Sprintf(Conf.Language(70), box.Name, absPath, err))
}
indexHistoryDir(filepath.Base(historyDir), NewLute())
copyDocAssetsToDataAssets(boxID, p)
rootID := tree.ID

1
kernel/model/format.go
View file

@ -102,4 +102,5 @@ func generateFormatHistory(tree *parse.Tree) {
return
}
indexHistoryDir(filepath.Base(historyDir), NewLute())
}

28
kernel/model/history.go
View file

@ -18,7 +18,6 @@ package model
import (
"encoding/json"
"errors"
"fmt"
"io/fs"
"math"
@ -387,8 +386,7 @@ func (box *Box) generateDocHistory0() {
}
}
luteEngine := NewLute()
indexHistoryDir(filepath.Base(historyDir), luteEngine)
indexHistoryDir(filepath.Base(historyDir), NewLute())
return
}
@ -503,10 +501,7 @@ func ReindexHistory() (err error) {
}
name := historyDir.Name()
err = indexHistoryDir(name, lutEngine)
if nil != err {
return
}
indexHistoryDir(name, lutEngine)
}
return
}
@ -518,7 +513,9 @@ const (
HistoryTypeAsset = 1
)
func indexHistoryDir(name string, luteEngine *lute.Lute) (err error) {
func indexHistoryDir(name string, luteEngine *lute.Lute) {
defer logging.Recover()
op := name[strings.LastIndex(name, "-")+1:]
if !gulu.Str.Contains(op, validOps) {
logging.LogWarnf("invalid history op [%s]", op)
@ -579,19 +576,16 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) (err error) {
tx, txErr := sql.BeginHistoryTx()
if nil != txErr {
msg := fmt.Sprintf("begin transaction failed: %s", txErr)
err = errors.New(msg)
logging.LogErrorf("begin transaction failed: %s", txErr)
return
}
if err = sql.InsertHistories(tx, histories); nil != err {
msg := fmt.Sprintf("insert histories failed: %s", err)
err = errors.New(msg)
if err := sql.InsertHistories(tx, histories); nil != err {
logging.LogErrorf("insert histories failed: %s", err)
sql.RollbackTx(tx)
return
}
if err = sql.CommitTx(tx); nil != err {
msg := fmt.Sprintf("commit transaction failed: %s", err)
err = errors.New(msg)
if err := sql.CommitTx(tx); nil != err {
logging.LogErrorf("commit transaction failed: %s", err)
return
}
return
@ -627,7 +621,7 @@ func fromSQLHistories(sqlHistories []*sql.History) (ret []*History) {
})
}
}
if 1 < len(items) {
if 0 < len(items) {
ret = append(ret, &History{
HCreated: time.Unix(tmpTime, 0).Format("2006-01-02 15:04:05"),
Items: items,