From c917626d471f5769b5292cac425c4ea2cb035f37 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 3 Dec 2025 17:50:25 +0800 Subject: [PATCH 1/2] :art: Improve searching for move blocks https://github.com/siyuan-note/siyuan/issues/15564#issuecomment-3604599711 Signed-off-by: Daniel <845765@qq.com> --- kernel/model/file.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/model/file.go b/kernel/model/file.go index c53f3d5eb..30954e2f8 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -187,8 +187,8 @@ func SearchDocsByKeyword(keyword string, flashcard bool, excludeIDs []string) (r } } - if 0 < len(excludeIDs) { - condition += fmt.Sprintf(" AND root_id NOT IN ('%s')", strings.Join(excludeIDs, "', '")) + for _, excludeID := range excludeIDs { + condition += fmt.Sprintf(" AND path NOT LIKE '%%%s%%' ", excludeID) } rootBlocks = sql.QueryRootBlockByCondition(condition, Conf.Search.Limit) From 364b25308282e17f1a9ce102ab3d292f51cc8a9a Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 3 Dec 2025 18:09:49 +0800 Subject: [PATCH 2/2] :art: Improve file history generation https://github.com/siyuan-note/siyuan/issues/16501 Signed-off-by: Daniel <845765@qq.com> --- kernel/api/setting.go | 1 + kernel/model/history.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/api/setting.go b/kernel/api/setting.go index adb06a756..dea84ec12 100644 --- a/kernel/api/setting.go +++ b/kernel/api/setting.go @@ -326,6 +326,7 @@ func setEditor(c *gin.Context) { model.Conf.Save() if oldGenerateHistoryInterval != model.Conf.Editor.GenerateHistoryInterval { + model.GenerateFileHistory() model.ChangeHistoryTick(editor.GenerateHistoryInterval) } diff --git a/kernel/model/history.go b/kernel/model/history.go index b9e64de58..7df9f9067 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -54,11 +54,11 @@ func AutoGenerateFileHistory() { ChangeHistoryTick(Conf.Editor.GenerateHistoryInterval) for { <-historyTicker.C - task.AppendTask(task.HistoryGenerateFile, generateFileHistory) + task.AppendTask(task.HistoryGenerateFile, GenerateFileHistory) } } -func generateFileHistory() { +func GenerateFileHistory() { defer logging.Recover() if 1 > Conf.Editor.GenerateHistoryInterval {