From 4041af465b783ea07c460298e1b01dec56981958 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 7 Feb 2023 10:05:20 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E5=BC=95=E7=94=A8=20https://github.com/siyuan-note/siyuan/issu?= =?UTF-8?q?es/4025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/block.go | 7 +++++++ kernel/model/index_fix.go | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/kernel/api/block.go b/kernel/api/block.go index 3e5ac4a37..5301270c2 100644 --- a/kernel/api/block.go +++ b/kernel/api/block.go @@ -40,7 +40,14 @@ func transferBlockRef(c *gin.Context) { } fromID := arg["fromID"].(string) + if util.InvalidIDPattern(fromID, ret) { + return + } toID := arg["toID"].(string) + if util.InvalidIDPattern(toID, ret) { + return + } + err := model.TransferBlockRef(fromID, toID) if nil != err { ret.Code = -1 diff --git a/kernel/model/index_fix.go b/kernel/model/index_fix.go index 65b2fc920..67a77f0fa 100644 --- a/kernel/model/index_fix.go +++ b/kernel/model/index_fix.go @@ -41,11 +41,13 @@ import ( func FixIndexJob() { task.AppendTask(task.DatabaseIndexFix, removeDuplicateDatabaseIndex) sql.WaitForWritingDatabase() + task.AppendTask(task.DatabaseIndexFix, fixBlockTreeByFileSys) sql.WaitForWritingDatabase() - task.AppendTask(task.DatabaseIndexFix, fixDatabaseIndexByBlockTree) + task.AppendTask(task.DatabaseIndexFix, fixDatabaseIndexByBlockTree) sql.WaitForWritingDatabase() + util.PushStatusBar(Conf.Language(185)) debug.FreeOSMemory() }