github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 20:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 文档重命名后变更文档更新时间 Fix https://github.com/siyuan-note/siyuan/issues/5792

Browse Source
This commit is contained in:
Liang Ding 2022-09-02 16:26:05 +08:00
parent 078ea5c793
commit a09e201f99
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/sql/block.go
View File

@ -18,6 +18,8 @@ package sql
import (
"database/sql"
"github.com/siyuan-note/siyuan/kernel/cache"
)
type Block struct {
@ -44,20 +46,21 @@ type Block struct {
Updated string
}
func updateRootContent(tx *sql.Tx, content, id string) {
stmt := "UPDATE blocks SET content = ?, fcontent = ? WHERE id = ?"
if err := execStmtTx(tx, stmt, content, content, id); nil != err {
func updateRootContent(tx *sql.Tx, content, updated, id string) {
stmt := "UPDATE blocks SET content = ?, fcontent = ?, updated = ? WHERE id = ?"
if err := execStmtTx(tx, stmt, content, content, updated, id); nil != err {
return
}
stmt = "UPDATE blocks_fts SET content = ?, fcontent = ? WHERE id = ?"
if err := execStmtTx(tx, stmt, content, content, id); nil != err {
stmt = "UPDATE blocks_fts SET content = ?, fcontent = ?, updated = ? WHERE id = ?"
if err := execStmtTx(tx, stmt, content, content, updated, id); nil != err {
return
}
stmt = "UPDATE blocks_fts_case_insensitive SET content = ?, fcontent = ? WHERE id = ?"
if err := execStmtTx(tx, stmt, content, content, id); nil != err {
stmt = "UPDATE blocks_fts_case_insensitive SET content = ?, fcontent = ?, updated = ? WHERE id = ?"
if err := execStmtTx(tx, stmt, content, content, updated, id); nil != err {
return
}
removeBlockCache(id)
cache.RemoveBlockIAL(id)
}
func InsertBlock(tx *sql.Tx, block *Block) (err error) {

23
kernel/sql/queue.go
View File

@ -46,10 +46,11 @@ type treeQueueOperation struct {
inQueueTime time.Time
action string // upsert/delete/delete_id/rename
upsertTree *parse.Tree // upsert
removeTreeBox, removeTreePath string // delete
removeTreeIDBox, removeTreeID string // delete_id
renameTreeBox, renameTreeID, renameTreeOldHPath, renameTreeNewHPath string // rename
upsertTree *parse.Tree // upsert
removeTreeBox, removeTreePath string // delete
removeTreeIDBox, removeTreeID string // delete_id
renameTree *parse.Tree // rename
renameTreeOldHPath string // rename
}
func AutoFlushTreeQueue() {
@ -113,9 +114,9 @@ func flushTreeQueue() {
DeleteByRootID(tx, op.removeTreeID)
boxes.Add(op.removeTreeIDBox)
case "rename":
batchUpdateHPath(tx, op.renameTreeBox, op.renameTreeID, op.renameTreeOldHPath, op.renameTreeNewHPath)
updateRootContent(tx, path.Base(op.renameTreeNewHPath), op.renameTreeID)
boxes.Add(op.renameTreeBox)
batchUpdateHPath(tx, op.renameTree.Box, op.renameTree.ID, op.renameTreeOldHPath, op.renameTree.HPath)
updateRootContent(tx, path.Base(op.renameTree.HPath), op.renameTree.Root.IALAttr("updated"), op.renameTree.ID)
boxes.Add(op.renameTree.Box)
default:
logging.LogErrorf("unknown operation [%s]", op.action)
}
@ -168,9 +169,13 @@ func RenameTreeQueue(tree *parse.Tree, oldHPath string) {
upsertTreeQueueLock.Lock()
defer upsertTreeQueueLock.Unlock()
newOp := &treeQueueOperation{renameTreeBox: tree.Box, renameTreeID: tree.ID, renameTreeOldHPath: oldHPath, renameTreeNewHPath: tree.HPath, inQueueTime: time.Now(), action: "rename"}
newOp := &treeQueueOperation{
renameTree: tree,
renameTreeOldHPath: oldHPath,
inQueueTime: time.Now(),
action: "rename"}
for i, op := range operationQueue {
if "rename" == op.action && op.renameTreeID == tree.ID { // 相同树则覆盖
if "rename" == op.action && op.renameTree.ID == tree.ID { // 相同树则覆盖
operationQueue[i] = newOp
return
}