mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-07-03 14:09:06 +02:00
36f4e3720e
* ✨ 搜索支持区分繁简选项 Add Simplified/Traditional Chinese sensitivity option for search 新增搜索配置 hanSensitive(区分繁简,默认开启 = 现状行为,命名与语义 向 caseSensitive 对齐)。关闭后简体与繁体可互相检索。 - FTS 层:关闭区分繁简时,blocks_fts / blocks_fts_case_insensitive 建表 追加 han_insensitive 分词器参数(依赖 88250/go-sqlite3 配套补丁), 繁体在分词时按单字折叠为简体,token 偏移仍指向原文; - 切换选项复用区分大小写现有的 FullReindex 流程; - 高亮:EncloseHighlighting 在关闭区分繁简时将关键字逐字符展开为 繁简等价字符类(如 诗经 -> [诗詩][经經]),与分词器使用同一份 OpenCC TSCharacters 映射数据; - 兼容:旧版本 conf.json 缺 hanSensitive 字段时按既往行为置为开启; setSearch 请求未携带该字段(现行前端/第三方调用)时保持当前值, 避免被零值意外翻转并触发重建索引; - 遵照配置界面重写计划(#17601),本次不改动设置界面与 i18n,仅添加 配置数据结构字段与前端类型定义(config.d.ts)。 范围说明:本次仅覆盖块全文搜索(关键字/查询语法)的命中与高亮; 历史/资源文件搜索、数据库属性过滤、虚拟引用、查找替换的替换动作 不在本次范围内(替换保持字节精确以避免误改原文)。 Fixes #13304 * 🐛 add missing util.SearchHanSensitive referenced by highlighting and sql.SetHanSensitive Copilot 评审指出 util.SearchHanSensitive 未定义导致无法编译:补上该全局 变量(默认 true,与既往行为一致,由 sql.SetHanSensitive 维护),并修正 conf/search.go 的 gofmt 对齐。已在本地以 dev 当前 go.mod(已合并的 88250/go-sqlite3 分词器)完成 go build -tags fts5 与 kernel/search 单测验证。
102 lines
2.9 KiB
Go
102 lines
2.9 KiB
Go
// SiYuan - Refactor your thinking
|
|
// Copyright (c) 2020-present, b3log.org
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/siyuan-note/siyuan/kernel/cache"
|
|
"github.com/siyuan-note/siyuan/kernel/job"
|
|
"github.com/siyuan-note/siyuan/kernel/model"
|
|
"github.com/siyuan-note/siyuan/kernel/plugin"
|
|
"github.com/siyuan-note/siyuan/kernel/server"
|
|
"github.com/siyuan-note/siyuan/kernel/sql"
|
|
"github.com/siyuan-note/siyuan/kernel/util"
|
|
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var serveCmd = &cobra.Command{
|
|
Use: "serve",
|
|
Short: "Start kernel HTTP server",
|
|
FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
|
|
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
|
|
return nil // bypass root's init — Boot() handles it
|
|
},
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
// Boot() uses flag.Parse() which expects raw --flags, not a cobra subcommand
|
|
// Strip the "serve" subcommand from os.Args before calling Boot()
|
|
saved := os.Args
|
|
newArgs := make([]string, 1, len(os.Args))
|
|
newArgs[0] = os.Args[0]
|
|
for i := 1; i < len(os.Args); i++ {
|
|
if i == 1 && os.Args[1] == "serve" {
|
|
continue
|
|
}
|
|
newArgs = append(newArgs, os.Args[i])
|
|
}
|
|
os.Args = newArgs
|
|
defer func() { os.Args = saved }()
|
|
|
|
// 设置工作目录为可执行文件所在目录
|
|
if exePath, err := os.Executable(); err == nil {
|
|
if resolved, err2 := filepath.EvalSymlinks(exePath); err2 == nil {
|
|
exePath = resolved
|
|
}
|
|
util.WorkingDir = filepath.Dir(exePath)
|
|
}
|
|
|
|
util.Boot()
|
|
|
|
model.InitJwtKey()
|
|
model.InitConf()
|
|
go server.Serve(false, model.Conf.CookieKey)
|
|
model.InitAppearance()
|
|
sql.InitDatabase(false)
|
|
sql.InitHistoryDatabase(false)
|
|
sql.InitAssetContentDatabase(false)
|
|
sql.SetCaseSensitive(model.Conf.Search.CaseSensitive)
|
|
sql.SetIndexAssetPath(model.Conf.Search.IndexAssetPath)
|
|
|
|
model.BootSyncData()
|
|
model.InitBoxes()
|
|
model.LoadFlashcards()
|
|
util.LoadAssetsTexts()
|
|
|
|
util.SetBooted()
|
|
util.PushClearAllMsg()
|
|
|
|
job.StartCron()
|
|
|
|
go model.AutoGenerateFileHistory()
|
|
go cache.LoadAssets()
|
|
go util.CheckFileSysStatus()
|
|
go plugin.InitManager()
|
|
go model.StartEmbeddingIndexer()
|
|
|
|
model.WatchAssets()
|
|
model.WatchEmojis()
|
|
model.WatchThemes()
|
|
model.HandleSignal()
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
rootCmd.AddCommand(serveCmd)
|
|
}
|