Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:recycle: Remove unused kernel functions and scoped wrappers https://github.com/siyuan-note/siyuan/issues/20232

Danielfac77915799f
diff --git a/kernel/api/av_contract_mapping.go b/kernel/api/av_contract_mapping.go
index 075ce03384..5073113590 100644
--- a/kernel/api/av_contract_mapping.go
+++ b/kernel/api/av_contract_mapping.go
@@ -917,20 +917,6 @@ func toContractAVKeyValues(value *av.KeyValues) *apicontract.AVKeyValues {
Values: avContractSlice(value.Values, func(value *av.Value) *apicontract.AVValue { return toContractAVValue(value) }),
}
}
-func toContractAVViewData(value *av.ViewData) *apicontract.AVViewData {
- if value == nil {
- return nil
- }
- return &apicontract.AVViewData{
- ID: value.ID,
- Icon: value.Icon,
- Name: value.Name,
- Desc: value.Desc,
- HideAttrViewName: value.HideAttrViewName,
- Type: string(value.Type),
- PageSize: value.PageSize,
- }
-}
func toContractAVNewItemTemplate(value *av.NewItemTemplate) *apicontract.AVNewItemTemplate {
if value == nil {
return nil
diff --git a/kernel/api/block.go b/kernel/api/block.go
index ba1e34e569..462c2e56b5 100644
--- a/kernel/api/block.go
+++ b/kernel/api/block.go
@@ -969,36 +969,6 @@ var getBlockDOMsWithEmbed = contractHandler(apicontract.GetBlockDOMsWithEmbed, f
return apicontract.Success(doms)
})
-func encryptedNotebookFromArg(arg map[string]any) string {
- notebook, _ := arg["notebook"].(string)
- if notebook != "" && model.IsEncryptedBox(notebook) {
- return notebook
- }
- return ""
-}
-
-func holdBlockRequest(c *gin.Context, ret *gulu.Result, boxID string, arg map[string]any, allowMissingIDs ...bool) bool {
- var ids []string
- if id, ok := arg["id"].(string); ok {
- ids = append(ids, id)
- }
- if values, ok := arg["ids"].([]any); ok {
- for _, value := range values {
- if id, ok := value.(string); ok {
- ids = append(ids, id)
- }
- }
- }
- // 存在性与状态检查需要接受已删除的块 ID;输出块内容的接口必须在准入时确定全部归属。
- allowMissing := len(allowMissingIDs) > 0 && allowMissingIDs[0]
- if err := holdEncryptedBlockRequests(c, boxID, ids, allowMissing); err != nil {
- ret.Code = -1
- ret.Msg = err.Error()
- return false
- }
- return true
-}
-
func isEncryptedNotebookDeniedForPublish(c *gin.Context, notebook string) bool {
return notebook != "" && model.IsReadOnlyRoleContext(c) && model.IsEncryptedBoxDeniedByPublishAccess(notebook)
}
diff --git a/kernel/api/contract_inline_style.go b/kernel/api/contract_inline_style.go
index de78173a36..452f25aa3c 100644
--- a/kernel/api/contract_inline_style.go
+++ b/kernel/api/contract_inline_style.go
@@ -110,40 +110,6 @@ func inlineStyleAVContract(value *model.InlineStyleAV) *apicontract.InlineStyleA
return result
}
-func workspaceAVBuiltinColorUpdateContract(value *model.WorkspaceAVBuiltinColorUpdate) *apicontract.WorkspaceAVBuiltinColorUpdate {
- if value == nil {
- return nil
- }
- result := &apicontract.WorkspaceAVBuiltinColorUpdate{}
- result.Index = value.Index
- result.Customized = value.Customized
- result.Light = inlineStyleThemeContract(value.Light)
- result.Dark = inlineStyleThemeContract(value.Dark)
- result.Hidden = value.Hidden
- return result
-}
-
-func workspaceAVPaletteUpdateContract(value *model.WorkspaceAVPaletteUpdate) *apicontract.WorkspaceAVPaletteUpdate {
- if value == nil {
- return nil
- }
- result := &apicontract.WorkspaceAVPaletteUpdate{}
- if value.Colors != nil {
- result.Colors = make([]*apicontract.AttributeViewCustomColor, len(value.Colors))
- for i, entry := range value.Colors {
- result.Colors[i] = attributeViewCustomColorContract(entry)
- }
- }
- result.Order = value.Order
- if value.BuiltinColors != nil {
- result.BuiltinColors = make([]*apicontract.WorkspaceAVBuiltinColorUpdate, len(value.BuiltinColors))
- for i, entry := range value.BuiltinColors {
- result.BuiltinColors[i] = workspaceAVBuiltinColorUpdateContract(entry)
- }
- }
- return result
-}
-
func inlineStylesContract(value *model.InlineStyles) *apicontract.InlineStyles {
if value == nil {
return nil
diff --git a/kernel/api/storage.go b/kernel/api/storage.go
index 096000a1c1..b94e4550a4 100644
--- a/kernel/api/storage.go
+++ b/kernel/api/storage.go
@@ -396,21 +396,3 @@ var removeViewState = contractHandler(apicontract.RemoveViewState, func(c *gin.C
return contractFailure[apicontract.Null](ret)
})
-
-func parseViewStateRemoveKeys(value any) (ret []string, valid bool) {
- if nil == value {
- return []string{}, true
- }
- values, ok := value.([]any)
- if !ok {
- return nil, false
- }
- for _, item := range values {
- key, ok := item.(string)
- if !ok || "" == strings.TrimSpace(key) {
- return nil, false
- }
- ret = append(ret, key)
- }
- return ret, true
-}
diff --git a/kernel/av/av.go b/kernel/av/av.go
index cc3abd489e..31aee89686 100644
--- a/kernel/av/av.go
+++ b/kernel/av/av.go
@@ -567,11 +567,6 @@ func getAttributeViewNameByPathInBox(avJSONPath, boxID string) (ret string, err
return
}
-// GetAttributeViewNameByPath 从指定路径读取 AV 名称(不加密,普通 box 兼容入口)。
-func GetAttributeViewNameByPath(avJSONPath string) (ret string, err error) {
- return getAttributeViewNameByPathInBox(avJSONPath, "")
-}
-
// GetAttributeViewNameInBox 获取指定笔记本中的数据库名称。
func GetAttributeViewNameInBox(avID, boxID string) (ret string, err error) {
avJSONPath, _ := FindAttributeViewPathInBox(avID, boxID)
diff --git a/kernel/av/encrypted_hook.go b/kernel/av/encrypted_hook.go
index f61e1f6432..9cb98fa150 100644
--- a/kernel/av/encrypted_hook.go
+++ b/kernel/av/encrypted_hook.go
@@ -199,33 +199,6 @@ func ReadAttributeViewDataInBox(avID, boxID string) ([]byte, error) {
return data, nil
}
-// writeAttributeViewData 写入 AV 定义数据(自动加密)。
-// boxID 为空时写全局路径(普通 box),非空时写加密笔记本路径并加密。
-func writeAttributeViewData(avID, boxID string, data []byte) error {
- if !ast.IsNodeIDPattern(avID) {
- return ErrInvalidAttributeViewID
- }
- if boxID != "" && !ast.IsNodeIDPattern(boxID) {
- return ErrInvalidBoxID
- }
-
- path := attributeViewDataPathByBox(avID, boxID)
- // 确保目录存在
- dir := filepath.Dir(path)
- if err := os.MkdirAll(dir, 0755); err != nil {
- return err
- }
- // 加密笔记本的数据需加密
- if boxID != "" {
- var err error
- data, err = encryptAVData(boxID, avID, data)
- if err != nil {
- return err
- }
- }
- return filelock.WriteFile(path, data)
-}
-
// mirrorBlocksPath 返回镜像索引文件的路径。
// 加密 box:<DataDir>/<boxID>/storage/av/blocks.msgpack
// 普通 box:<DataDir>/storage/av/blocks.msgpack
@@ -236,14 +209,6 @@ func mirrorBlocksPath(boxID string) string {
return filepath.Join(util.DataDir, "storage", "av", "blocks.msgpack")
}
-// mirrorBlocksPathByAvID 通过 AV 定义的归属 box 返回镜像索引路径。
-// 先查 findAttributeViewPath(含 pendingAVBox fallback),找到则返回对应 box 的镜像路径。
-// 找不到则返回全局路径。
-func mirrorBlocksPathByAvID(avID string) string {
- _, boxID := FindAttributeViewPath(avID)
- return mirrorBlocksPath(boxID)
-}
-
// readMirrorBlocks 按路径读取镜像索引(boxID 为空读全局,非空读加密 box)。
// 加密笔记本的镜像索引是 DEK 加密的密文,读取后需解密。
func readMirrorBlocks(boxID string) (ret map[string][]string) {
diff --git a/kernel/av/value.go b/kernel/av/value.go
index 6c08ca4718..3592b075d1 100644
--- a/kernel/av/value.go
+++ b/kernel/av/value.go
@@ -199,14 +199,6 @@ func (value *Value) String(format bool) string {
}
}
-func (value *Value) ToJSONString() string {
- data, err := gulu.JSON.MarshalJSON(value)
- if err != nil {
- return ""
- }
- return string(data)
-}
-
func (value *Value) Clone() (ret *Value) {
data, err := gulu.JSON.MarshalJSON(value)
if err != nil {
@@ -2521,16 +2513,6 @@ func NewFormattedValueDate(content, content2 int64, format DateFormat, isNotTime
return
}
-// RoundUp rounds like 12.3416 -> 12.35
-func RoundUp(val float64, precision int) float64 {
- return math.Ceil(val*(math.Pow10(precision))) / math.Pow10(precision)
-}
-
-// RoundDown rounds like 12.3496 -> 12.34
-func RoundDown(val float64, precision int) float64 {
- return math.Floor(val*(math.Pow10(precision))) / math.Pow10(precision)
-}
-
// Round rounds to nearest like 12.3456 -> 12.35
func Round(val float64, precision int) float64 {
return math.Round(val*(math.Pow10(precision))) / math.Pow10(precision)
diff --git a/kernel/bazaar/install.go b/kernel/bazaar/install.go
index bdde9147d5..01a67f8f38 100644
--- a/kernel/bazaar/install.go
+++ b/kernel/bazaar/install.go
@@ -95,12 +95,6 @@ var packageManifestNames = func() map[string]string {
return names
}()
-// InstallPackage 安装集市包
-func InstallPackage(repoURL, repoHash, repoRef, installPath, systemID, pkgType, packageName string, update bool) error {
- _, err := InstallPackageWithOptions(repoURL, repoHash, repoRef, installPath, systemID, pkgType, packageName, update, PackageInstallOptions{})
- return err
-}
-
// InstallPackageWithOptions 将在线包替换也纳入目标版本校验。
func InstallPackageWithOptions(repoURL, repoHash, repoRef, installPath, systemID, pkgType, packageName string, update bool, options PackageInstallOptions) (*PackageInstallResult, error) {
if options.ExpectedInstalledRevision == "" {
diff --git a/kernel/bazaar/local.go b/kernel/bazaar/local.go
index c4e3458346..d1ffa86832 100644
--- a/kernel/bazaar/local.go
+++ b/kernel/bazaar/local.go
@@ -147,15 +147,6 @@ func extractLocalPackageWithHash(ctx context.Context, archivePath, expectedHash
return
}
-func extractLocalPackageArchive(archivePath, destination string) error {
- reader, err := zip.OpenReader(archivePath)
- if err != nil {
- return errors.New("invalid marketplace package archive")
- }
- defer reader.Close()
- return extractLocalPackageReader(&reader.Reader, destination)
-}
-
func extractLocalPackageReader(reader *zip.Reader, destination string) error {
return extractLocalPackageReaderContext(context.Background(), reader, destination)
}
diff --git a/kernel/cache/tree.go b/kernel/cache/tree.go
index 433cc8a449..d827ec473c 100644
--- a/kernel/cache/tree.go
+++ b/kernel/cache/tree.go
@@ -42,10 +42,6 @@ func treeCacheKey(rootID, boxID string) string {
return boxID + "\x00" + rootID
}
-func GetTreeData(rootID string) (raw []byte, ok bool) {
- return GetTreeDataInBox(rootID, "")
-}
-
func GetTreeDataInBox(rootID, boxID string) (raw []byte, ok bool) {
treeCacheKeysMu.Lock()
defer treeCacheKeysMu.Unlock()
@@ -62,10 +58,6 @@ func GetTreeDataInBox(rootID, boxID string) (raw []byte, ok bool) {
return e.raw, true
}
-func SetTreeData(rootID string, raw []byte) {
- SetTreeDataInBox(rootID, "", raw)
-}
-
func SetTreeDataInBox(rootID, boxID string, raw []byte) {
if raw == nil {
return
diff --git a/kernel/conf/search.go b/kernel/conf/search.go
index 3d5a46b832..b0c24ffd62 100644
--- a/kernel/conf/search.go
+++ b/kernel/conf/search.go
@@ -123,9 +123,6 @@ func NewSearch() *Search {
}
}
-//go:fix inline
-func boolPtr(v bool) *bool { return new(v) }
-
// HanSensitiveVal 返回 HanSensitive 的 bool 值;nil 视为 true(与既往行为一致)。
func (s *Search) HanSensitiveVal() bool {
if s.HanSensitive == nil {
diff --git a/kernel/filesys/crypto_hook.go b/kernel/filesys/crypto_hook.go
index ff8d636f75..ea99e72ced 100644
--- a/kernel/filesys/crypto_hook.go
+++ b/kernel/filesys/crypto_hook.go
@@ -142,27 +142,6 @@ func encryptedBox(boxID string) bool {
return err == nil && dek != nil
}
-// encryptData 若 boxID 是已解锁的加密 box,用 fileKey(DEK 派生子密钥)加密 data,
-// AAD 绑定 boxID + 稳定文件基名(不含父目录);非加密笔记本原样返回;加密但未解锁时返回 error,拒绝写盘(防止明文泄漏)。
-func encryptData(boxID, relativePath string, data []byte) ([]byte, error) {
- dek, _, release, err := acquireCryptoLease(boxID)
- if err != nil {
- return nil, err
- }
- defer release()
- return encryptDataWithDEK(boxID, relativePath, data, dek)
-}
-
-// decryptData 对应解密。非加密笔记本原样返回;加密但未解锁时返回 error,拒绝读盘。
-func decryptData(boxID, relativePath string, data []byte) ([]byte, error) {
- dek, _, release, err := acquireCryptoLease(boxID)
- if err != nil {
- return nil, err
- }
- defer release()
- return decryptDataWithDEK(boxID, relativePath, data, dek)
-}
-
// docIALBoxID 从 .sy 绝对路径反推 boxID,供 DocIAL 判断是否需整体解密。
// 路径形如 <DataDir>/<boxID>/...;若不在 DataDir 下或 boxID 非合法 ID 模式,返回空串。
func docIALBoxID(absPath string) string {
diff --git a/kernel/mcp/client/mcp.go b/kernel/mcp/client/mcp.go
index 44b54d74d7..18c004df25 100644
--- a/kernel/mcp/client/mcp.go
+++ b/kernel/mcp/client/mcp.go
@@ -204,19 +204,6 @@ func (h *headerRoundTripper) RoundTrip(req *http.Request) (*http.Response, error
return h.base.RoundTrip(clone)
}
-func DisconnectMCP() {
- mcpMu.Lock()
- defer mcpMu.Unlock()
- if mcpConnectCancel != nil {
- mcpConnectCancel()
- mcpConnectCancel = nil
- }
- mcpGeneration++
- mcpConnecting = false
- closeConnections(mcpConns)
- mcpConns = nil
-}
-
func connectServers(ctx context.Context, servers []conf.MCPServer, interactive map[string]bool, connected func(Connection) bool) {
for _, server := range servers {
if ctx.Err() != nil {
diff --git a/kernel/model/assets.go b/kernel/model/assets.go
index 1ecf32b66f..6acd1aa2c4 100644
--- a/kernel/model/assets.go
+++ b/kernel/model/assets.go
@@ -56,10 +56,6 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
-func GetAssetImgSize(assetPath string) (width, height int) {
- return GetAssetImgSizeInBox(assetPath, "")
-}
-
func GetAssetImgSizeInBox(assetPath, boxID string) (width, height int) {
absPath, resolveErr := GetAssetAbsPathInBox(assetPath, boxID)
if resolveErr != nil || !filelock.IsExist(absPath) {
@@ -1451,10 +1447,6 @@ func getAssetAbsPath(relativePath string, includeEncrypted bool) (absPath string
return deferredAssetPath(relativePath, "", includeEncrypted)
}
-func UploadAssets2Cloud(id string, ignorePushMsg bool) (count int, err error) {
- return UploadAssets2CloudWithApp(id, ignorePushMsg, "")
-}
-
// UploadAssets2CloudWithApp 将块资源上传提示限定到发起实例;空标识保留广播。
func UploadAssets2CloudWithApp(id string, ignorePushMsg bool, app string) (count int, err error) {
if !IsSubscriber() {
@@ -1490,10 +1482,6 @@ func UploadAssets2CloudWithApp(id string, ignorePushMsg bool, app string) (count
return
}
-func UploadAssets2CloudByAssetsPaths(assetPaths []string, ignorePushMsg bool) (count int, err error) {
- return UploadAssets2CloudByAssetsPathsWithApp(assetPaths, ignorePushMsg, "")
-}
-
// UploadAssets2CloudByAssetsPathsWithApp 在同一实例显示、更新和清除本次上传的提示。
func UploadAssets2CloudByAssetsPathsWithApp(assetPaths []string, ignorePushMsg bool, app string) (count int, err error) {
if !IsSubscriber() {
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index e8ba43bd48..417754cc58 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -8092,47 +8092,6 @@ func (tx *Transaction) doUpdateAttrViewCells(operation *Operation) (ret *TxErr)
return
}
-func BatchUpdateAttributeViewCells(tx *Transaction, avID string, values []any) (err error) {
- attrView, err := av.ParseAttributeView(avID)
- if err != nil {
- return
- }
-
- var cells []*AttrViewCellUpdate
- for _, value := range values {
- v := value.(map[string]any)
- keyID := v["keyID"].(string)
- var itemID string
- if _, ok := v["itemID"]; ok {
- itemID = v["itemID"].(string)
- } else if _, ok := v["rowID"]; ok {
- // TODO 该参数将于 2026 年 12 月 1 日后删除
- itemID = v["rowID"].(string)
- msg := fmt.Sprintf("[%s] parameter [%s] is deprecated, visit [https://github.com/siyuan-note/siyuan/issues/15727] for details",
- "/api/av/batchSetAttributeViewBlockAttrs", "rowID")
- logging.LogWarn(msg)
- err = errors.New(msg)
- return
- }
- cells = append(cells, &AttrViewCellUpdate{KeyID: keyID, RowID: itemID, Data: v["value"]})
- }
- if err = preflightAttributeViewCellBindings(tx, attrView, cells); err != nil {
- return
- }
- for _, cell := range cells {
- _, err = updateAttributeViewValue(tx, attrView, cell.KeyID, cell.RowID, cell.Data, false)
- if err != nil {
- return
- }
- }
- regenAttrViewGroups(attrView)
- if err = av.SaveAttributeView(attrView); err != nil {
- return
- }
- refreshRelatedSrcAvs(avID, tx)
- return
-}
-
func UpdateAttributeViewCell(tx *Transaction, avID, keyID, itemID string, valueData any) (val *av.Value, err error) {
return updateAttributeViewCellInBlock(tx, avID, "", keyID, itemID, valueData)
}
diff --git a/kernel/model/attribute_view_new_item.go b/kernel/model/attribute_view_new_item.go
index 28d0de48dc..7d40703c7f 100644
--- a/kernel/model/attribute_view_new_item.go
+++ b/kernel/model/attribute_view_new_item.go
@@ -423,10 +423,6 @@ func attributeViewItemDocumentTemplate(attrView *av.AttributeView, saveMode stri
}
}
-func resolveAttributeViewNewItemTemplate(blockID string, itemTemplate *av.NewItemTemplate, createdAt time.Time) (*NewItemTemplatePreview, error) {
- return resolveAttributeViewNewItemTemplateWithFallback(blockID, itemTemplate, createdAt, "")
-}
-
func resolveAttributeViewNewItemTemplateWithFallback(blockID string, itemTemplate *av.NewItemTemplate, createdAt time.Time,
primaryFallback string) (*NewItemTemplatePreview, error) {
boxID := ""
diff --git a/kernel/model/block.go b/kernel/model/block.go
index 0a6fd6d2da..845071ba1f 100644
--- a/kernel/model/block.go
+++ b/kernel/model/block.go
@@ -1327,10 +1327,6 @@ func GetBlockDOMsWithEmbedInBoxWithAccessChecker(ids []string, boxID string, acc
return
}
-func resolveEmbedContent(n *ast.Node, luteEngine *lute.Lute) {
- resolveEmbedContentInBox(n, luteEngine, "", nil)
-}
-
// loadTreeForBlockDOM 按指定 box 加载树,空 box 不回退搜索已打开的加密笔记本。
func loadTreeForBlockDOM(id, boxID string) *parse.Tree {
bt := treenode.GetBlockTreeInBox(id, boxID)
diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go
index 399e79341b..336c7547b9 100644
--- a/kernel/model/blockinfo.go
+++ b/kernel/model/blockinfo.go
@@ -437,10 +437,6 @@ type RefDefs struct {
DefIDs []string `json:"defIDs"`
}
-func GetBlockRefs(defID string) (refDefs []*RefDefs, originalRefBlockIDs map[string]string) {
- return GetBlockRefsInBox(defID, "")
-}
-
// GetBlockRefsInBox 获取指定笔记本内的块引用关系。空 box 不回退搜索加密笔记本。
func GetBlockRefsInBox(defID, boxID string) (refDefs []*RefDefs, originalRefBlockIDs map[string]string) {
refDefs = []*RefDefs{}
@@ -489,10 +485,6 @@ func queryBlockRefDefsInBox(bt *treenode.BlockTree, boxID string) (refDefs []*Re
return
}
-func GetBlockRefIDsByFileAnnotationID(id string) []string {
- return sql.QueryRefIDsByAnnotationID(id)
-}
-
func GetBlockRefIDsByFileAnnotationIDInBox(id, boxID string) []string {
return sql.QueryRefIDsByAnnotationIDInBox(id, boxID)
}
diff --git a/kernel/model/carddav.go b/kernel/model/carddav.go
index 4d2a00b2a2..9be8a9e049 100644
--- a/kernel/model/carddav.go
+++ b/kernel/model/carddav.go
@@ -99,23 +99,6 @@ var (
ErrorCardDavAddressFileExtensionNameInvalid = errors.New("CardDAV: address file extension name is invalid")
)
-// ImportAddressBook imports an address book from a vCard file (*.vcf)
-func ImportAddressBook(addressBookPath, cardContent string) (addresses []*AddressObject, err error) {
- // TODO: Check whether the path is valid (PathDepth: Address)
- // TODO: Check whether the address book exists
- // TODO: Decode the card content
- // TODO: Save the cards to the file system
- return
-}
-
-// ExportAddressBook exports an address book to a vCard file (*.vcf)
-func ExportAddressBook(addressBookPath string) (cardContent string, err error) {
- // TODO: Check whether the path is valid (PathDepth: AddressBook)
- // TODO: Check whether the address book exists
- // TODO: Encode the card content
- return
-}
-
// AddressBooksMetaDataFilePath returns the absolute path of the address books metadata file
func AddressBooksMetaDataFilePath() string {
return DavPath2DirectoryPath(CardDavAddressBooksMetaDataFilePath)
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index e1d6bba0cf..c66805b664 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -60,7 +60,7 @@ type AppConf struct {
Editor *conf.Editor `json:"editor"` // 编辑器配置
Export *conf.Export `json:"export"` // 导出配置
Graph *conf.Graph `json:"graph"` // 关系图配置
- UILayout *conf.UILayout `json:"uiLayout"` // 界面布局。不要直接使用,使用 GetUILayout() 和 SetUILayout() 方法
+ UILayout *conf.UILayout `json:"uiLayout"` // 界面布局,通过 SetUILayout 更新
UserData string `json:"userData"` // 社区用户信息,对 User 加密存储
User *conf.User `json:"-"` // 社区用户内存结构,不持久化。不要直接使用,使用 GetUser() 和 SetUser() 方法
ReadOnly bool `json:"readonly"` // 是否是以只读模式运行
@@ -213,12 +213,6 @@ func (conf *AppConf) SetAI(ai *conf.AI) {
conf.Save()
}
-func (conf *AppConf) GetUILayout() *conf.UILayout {
- conf.m.Lock()
- defer conf.m.Unlock()
- return conf.UILayout
-}
-
func (conf *AppConf) SetUILayout(uiLayout *conf.UILayout) {
conf.m.Lock()
defer conf.m.Unlock()
diff --git a/kernel/model/crypto.go b/kernel/model/crypto.go
index 2b3ff4a4a2..76d05aaf8a 100644
--- a/kernel/model/crypto.go
+++ b/kernel/model/crypto.go
@@ -2229,7 +2229,7 @@ func ExtractBoxIDFromHistoryPath(absPath string) string {
// EncryptFile 用 fileKey(DEK 派生子密钥)加密 .sy 文档字节,AAD 绑定 boxID + 稳定文件基名(不含父目录)。
// relativePath 会先经 filesys.SyAAD 提取稳定文件基名(<rootID>.sy)并校验合法性,
-// 与 filesys.encryptData/decryptData 共用同一 AAD 构造入口,保证加解密一致。
+// 与文件系统读写共用同一 AAD 构造入口,保证加解密一致。
func EncryptFile(boxID, relativePath string, dek, plaintext []byte) ([]byte, error) {
fileKey := util.DeriveSubKey(dek, "siyuan/file")
defer zeroAndClear(fileKey)
diff --git a/kernel/model/export.go b/kernel/model/export.go
index b6742411be..f11945eae2 100644
--- a/kernel/model/export.go
+++ b/kernel/model/export.go
@@ -600,17 +600,6 @@ func ExportSystemLog() (zipPath string) {
return
}
-// exportLockedByBlockID 由 docID/blockID 反查 boxID,判断其所属加密笔记本是否未解锁。
-// 未解锁返回 true(调用方应中止导出并返回空结果);普通笔记本或已解锁返回 false。
-// 用于文档级导出入口的统一 guard,避免未解锁时读出密文或空结果。
-func exportLockedByBlockID(id string) bool {
- bt := getExportBlockTree(id)
- if nil == bt {
- return false // 找不到块树,交给后续流程处理
- }
- return IsEncryptedBox(bt.BoxID) && !IsBoxUnlocked(bt.BoxID)
-}
-
// withExportReadLockByBlockID 由 blockID 反查 boxID,若属于加密笔记本则全程持读锁执行 fn。
// 持锁期间 LockBox(自动锁定)会阻塞等待,避免操作中途清 DEK/删导出目录导致部分明文写出。
// 准入租约先于读锁取得,确保嵌套资源读取期间不会出现等待中的写锁。
diff --git a/kernel/model/publish_access.go b/kernel/model/publish_access.go
index f3cb5fce7c..4df0b09d09 100644
--- a/kernel/model/publish_access.go
+++ b/kernel/model/publish_access.go
@@ -432,11 +432,6 @@ func CheckBlockTreeMetadataAccessableByPublishAccess(c *gin.Context, publishAcce
return password == "" || CheckPublishAuthCookie(c, passwordID, password)
}
-func CheckBlockIdDiscoverableByPublishAccessInBox(publishAccess PublishAccess, blockID, boxID string) bool {
- bt := treenode.GetBlockTreeInBox(blockID, boxID)
- return CheckBlockTreeDiscoverableByPublishAccess(publishAccess, bt)
-}
-
func CheckBlockTreeDiscoverableByPublishAccess(publishAccess PublishAccess, bt *treenode.BlockTree) bool {
if bt == nil || IsEncryptedBoxDeniedByPublishAccess(bt.BoxID) {
return false
diff --git a/kernel/model/render.go b/kernel/model/render.go
index 644eb678f7..5fa4e2dd5d 100644
--- a/kernel/model/render.go
+++ b/kernel/model/render.go
@@ -244,10 +244,6 @@ func cleanRenderNode(node *ast.Node, visibleOnly bool) *ast.Node {
return nodes[0]
}
-func renderCleanBlockDOMByNodes(nodes []*ast.Node, luteEngine *lute.Lute) string {
- return renderBlockDOMByNodes(cleanRenderNodes(nodes, false), luteEngine)
-}
-
func renderVisibleBlockDOMByNodes(nodes []*ast.Node, luteEngine *lute.Lute) string {
return renderBlockDOMByNodes(cleanRenderNodes(nodes, true), luteEngine)
}
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 46a4ec9cb2..c3d8d6db39 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -2475,7 +2475,6 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
elapsed.Seconds(),
mergeResult.ConflictCount(), len(mergeResult.Upserts), len(mergeResult.Removes))
- //logSyncMergeResult(mergeResult)
themes, icons := appearanceChangedPackages(mergeResult)
refreshAppearancePackages(themes, icons)
@@ -2958,47 +2957,6 @@ func removeLANSyncTrafficStat(message string) string {
return message
}
-func logSyncMergeResult(mergeResult *dejavu.MergeResult) {
- if !mergeResult.DataChanged() {
- return
- }
-
- conflictPaths := mergeResult.ConflictPaths()
- if 0 < len(conflictPaths) {
- logBuilder := bytes.Buffer{}
- for i, path := range conflictPaths {
- logBuilder.WriteString(" ")
- logBuilder.WriteString(path)
- if i < len(conflictPaths)-1 {
- logBuilder.WriteString("\n")
- }
- }
- logging.LogInfof("sync conflicts:\n%s", logBuilder.String())
- }
- if 0 < len(mergeResult.Upserts) {
- logBuilder := bytes.Buffer{}
- for i, f := range mergeResult.Upserts {
- logBuilder.WriteString(" ")
- logBuilder.WriteString(f.Path)
- if i < len(mergeResult.Upserts)-1 {
- logBuilder.WriteString("\n")
- }
- }
- logging.LogInfof("sync merge upserts:\n%s", logBuilder.String())
- }
- if 0 < len(mergeResult.Removes) {
- logBuilder := bytes.Buffer{}
- for i, f := range mergeResult.Removes {
- logBuilder.WriteString(" ")
- logBuilder.WriteString(f.Path)
- if i < len(mergeResult.Removes)-1 {
- logBuilder.WriteString("\n")
- }
- }
- logging.LogInfof("sync merge removes:\n%s", logBuilder.String())
- }
-}
-
func needFullReindex(upsertTrees int) bool {
return 0.2 < float64(upsertTrees)/float64(treenode.CountTrees())
}
diff --git a/kernel/model/search.go b/kernel/model/search.go
index 749b22fe9c..f61f621041 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -2165,10 +2165,6 @@ func sqlQuoteJoin(items []string) string {
return strings.Join(quoted, ",")
}
-func searchBySQL(stmt string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
- return searchBySQLInBox(stmt, beforeLen, page, pageSize, "")
-}
-
// isTreeExcludedByPublishAccess 判断文档树是否命中发布访问排除的文档 ID。
// 文档路径包含排除 ID 即视为不可见,覆盖被排除文档的整个子树。
func isTreeExcludedByPublishAccess(tree *parse.Tree, excludeDocIDs []string) bool {
@@ -2180,7 +2176,7 @@ func isTreeExcludedByPublishAccess(tree *parse.Tree, excludeDocIDs []string) boo
return false
}
-// searchBySQLInBox 与 searchBySQL 一致,但按 boxID 路由到加密 db 或全局 db。
+// searchBySQLInBox 按 boxID 选择加密或全局数据库,执行分页查询并统计匹配数量。
func searchBySQLInBox(stmt string, beforeLen, page, pageSize int, boxID string) (ret []*Block, matchedBlockCount, matchedRootCount int) {
return searchBySQLInBoxContext(context.Background(), stmt, beforeLen, page, pageSize, boxID)
}
@@ -2249,11 +2245,7 @@ func removeLimitClause(stmt string) string {
return stmt
}
-func fullTextSearchRefBlock(keyword string, beforeLen int, onlyDoc bool) (ret []*Block) {
- return fullTextSearchRefBlockInBox(keyword, beforeLen, onlyDoc, "")
-}
-
-// fullTextSearchRefBlockInBox 与 fullTextSearchRefBlock 一致,但按 boxID 路由到加密 db 或全局 db。
+// fullTextSearchRefBlockInBox 在指定笔记本内搜索可引用块,空 boxID 使用全局数据库。
func fullTextSearchRefBlockInBox(keyword string, beforeLen int, onlyDoc bool, boxID string) (ret []*Block) {
keyword = filterQueryInvisibleChars(keyword)
@@ -2378,10 +2370,6 @@ func extractID(content string) (ret string) {
return
}
-func fullTextSearchByRegexp(exp, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter, orderBy string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
- return fullTextSearchByRegexpInBox(exp, boxFilter, pathFilter, boxArgs, pathArgs, typeFilter, ignoreFilter, orderBy, beforeLen, page, pageSize, "")
-}
-
func fullTextSearchByRegexpInBox(exp, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter, orderBy string, beforeLen, page, pageSize int, boxID string) (ret []*Block, matchedBlockCount, matchedRootCount int) {
fieldFilter := fieldRegexp(exp)
stmt := "SELECT * FROM `blocks` WHERE " + fieldFilter + " AND " + typeFilter
@@ -2404,10 +2392,6 @@ func fullTextSearchByRegexpInBox(exp, boxFilter, pathFilter string, boxArgs, pat
return
}
-func fullTextSearchCountByRegexp(exp, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter string) (matchedBlockCount, matchedRootCount int) {
- return fullTextSearchCountByRegexpInBox(exp, boxFilter, pathFilter, boxArgs, pathArgs, typeFilter, ignoreFilter, "")
-}
-
func fullTextSearchCountByRegexpInBox(exp, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter, boxID string) (matchedBlockCount, matchedRootCount int) {
fieldFilter := fieldRegexp(exp)
stmt := "SELECT COUNT(id) AS `matches`, COUNT(DISTINCT(root_id)) AS `docs` FROM `blocks` WHERE " + fieldFilter + " AND " + typeFilter + ignoreFilter
@@ -2422,10 +2406,6 @@ func fullTextSearchCountByRegexpInBox(exp, boxFilter, pathFilter string, boxArgs
return
}
-func fullTextSearchByFTS(query, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter, orderBy string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
- return fullTextSearchByFTSInBox(query, boxFilter, pathFilter, boxArgs, pathArgs, typeFilter, ignoreFilter, orderBy, beforeLen, page, pageSize, "")
-}
-
func fullTextSearchByFTSInBox(query, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter, orderBy string, beforeLen, page, pageSize int, boxID string) (ret []*Block, matchedBlockCount, matchedRootCount int) {
table := "blocks_fts"
projections := "id, parent_id, root_id, hash, box, path, " +
@@ -2703,10 +2683,6 @@ func hPathOnlyOrderBy() string {
"CASE WHEN matches.match_source = 1 THEN b.hpath END ASC"
}
-func fullTextSearchCountByFTS(query, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter string) (matchedBlockCount, matchedRootCount int) {
- return fullTextSearchCountByFTSInBox(query, boxFilter, pathFilter, boxArgs, pathArgs, typeFilter, ignoreFilter, "")
-}
-
func fullTextSearchCountByFTSInBox(query, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter, boxID string) (matchedBlockCount, matchedRootCount int) {
table := "blocks_fts"
@@ -2726,10 +2702,6 @@ func fullTextSearchCountByFTSInBox(query, boxFilter, pathFilter string, boxArgs,
return
}
-func fullTextSearchByLikeWithRoot(query, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter string, orderBy, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
- return fullTextSearchByLikeWithRootInBox(query, boxFilter, pathFilter, boxArgs, pathArgs, typeFilter, ignoreFilter, orderBy, beforeLen, page, pageSize, "", true)
-}
-
func fullTextSearchByLikeWithRootInBox(query, boxFilter, pathFilter string, boxArgs, pathArgs []any, typeFilter, ignoreFilter string, orderBy, beforeLen, page, pageSize int, boxID string, searchHPath bool) (ret []*Block, matchedBlockCount, matchedRootCount int) {
rawQuery := query
query = strings.ReplaceAll(query, "'", "''") // 不需要转义双引号,因为条件都是通过单引号包裹的,只需要转义单引号即可
@@ -2882,11 +2854,7 @@ func buildSearchDocumentLikeFilterWithHPath(contentField, hPathField string, key
return ret.String()
}
-func highlightByFTS(query, typeFilter, id string) (ret []string) {
- return highlightByFTSInBox(query, typeFilter, id, "")
-}
-
-// highlightByFTSInBox 与 highlightByFTS 一致,但按 boxID 路由到加密 db 或全局 db。
+// highlightByFTSInBox 按 boxID 选择加密或全局数据库,获取全文检索高亮片段。
func highlightByFTSInBox(query, typeFilter, id, boxID string) (ret []string) {
query = strings.ReplaceAll(query, " ", " OR ")
const limit = 256
@@ -2941,11 +2909,7 @@ func highlightByFTSInBox(query, typeFilter, id, boxID string) (ret []string) {
return
}
-func highlightByRegexp(query, typeFilter, id string) (ret []string) {
- return highlightByRegexpInBox(query, typeFilter, id, "")
-}
-
-// highlightByRegexpInBox 与 highlightByRegexp 一致,但按 boxID 路由到加密 db 或全局 db。
+// highlightByRegexpInBox 按 boxID 选择加密或全局数据库,获取正则检索高亮片段。
func highlightByRegexpInBox(query, typeFilter, id, boxID string) (ret []string) {
fieldFilter := fieldRegexp(query)
stmt := "SELECT * FROM `blocks` WHERE " + fieldFilter + " AND " + typeFilter
diff --git a/kernel/model/session.go b/kernel/model/session.go
index 6029f45434..1c9ba4eeb2 100644
--- a/kernel/model/session.go
+++ b/kernel/model/session.go
@@ -450,29 +450,6 @@ func CheckAdminRole(c *gin.Context) {
}
}
-func CheckEditRole(c *gin.Context) {
- if IsValidRole(GetGinContextRole(c), []Role{
- RoleAdministrator,
- RoleEditor,
- }) {
- c.Next()
- } else {
- c.AbortWithStatus(http.StatusForbidden)
- }
-}
-
-func CheckReadRole(c *gin.Context) {
- if IsValidRole(GetGinContextRole(c), []Role{
- RoleAdministrator,
- RoleEditor,
- RoleReader,
- }) {
- c.Next()
- } else {
- c.AbortWithStatus(http.StatusForbidden)
- }
-}
-
var timingAPIs = map[string]int{
"/api/search/fullTextSearchBlock": 200, // Monitor the search performance and suggest solutions https://github.com/siyuan-note/siyuan/issues/7873
}
diff --git a/kernel/sql/av_gallery.go b/kernel/sql/av_gallery.go
index 3445e74e77..dcf5540f43 100644
--- a/kernel/sql/av_gallery.go
+++ b/kernel/sql/av_gallery.go
@@ -17,13 +17,6 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
-func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query string, depth *int, cachedAttrViews map[string]*av.AttributeView, ignoreRows bool) (ret *av.Gallery) {
- context := NewAttributeViewRenderContext()
- ret = renderAttributeViewGallery(attrView, view, query, depth, cachedAttrViews, ignoreRows, false, context)
- context.PushTemplateErrors()
- return
-}
-
func renderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query string, depth *int,
cachedAttrViews map[string]*av.AttributeView, ignoreRows, deferTemplateValues bool,
renderContext *AttributeViewRenderContext) (ret *av.Gallery) {
diff --git a/kernel/sql/av_kanban.go b/kernel/sql/av_kanban.go
index 5eb632675c..127b675347 100644
--- a/kernel/sql/av_kanban.go
+++ b/kernel/sql/av_kanban.go
@@ -10,13 +10,6 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
-func RenderAttributeViewKanban(attrView *av.AttributeView, view *av.View, query string, depth *int, cachedAttrViews map[string]*av.AttributeView, ignoreRows bool) (ret *av.Kanban) {
- context := NewAttributeViewRenderContext()
- ret = renderAttributeViewKanban(attrView, view, query, depth, cachedAttrViews, ignoreRows, false, context)
- context.PushTemplateErrors()
- return
-}
-
func renderAttributeViewKanban(attrView *av.AttributeView, view *av.View, query string, depth *int,
cachedAttrViews map[string]*av.AttributeView, ignoreRows, deferTemplateValues bool,
renderContext *AttributeViewRenderContext) (ret *av.Kanban) {
diff --git a/kernel/sql/block_query.go b/kernel/sql/block_query.go
index d245789141..865faaa93e 100644
--- a/kernel/sql/block_query.go
+++ b/kernel/sql/block_query.go
@@ -22,7 +22,6 @@ import (
"database/sql"
"errors"
"math"
- "regexp"
"sort"
"strconv"
"strings"
@@ -184,38 +183,6 @@ func queryBlockIDByParentID(parentID string) (ret []string) {
return
}
-func QueryBlockAliases(rootID string) (ret []string) {
- sqlStmt := "SELECT alias FROM blocks WHERE root_id = ? AND alias != ''"
- rows, err := query(sqlStmt, rootID)
- if err != nil {
- logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)
- return
- }
- defer rows.Close()
- var aliasesRows []string
- for rows.Next() {
- var name string
- rows.Scan(&name)
- aliasesRows = append(aliasesRows, name)
- }
-
- for _, aliasStr := range aliasesRows {
- aliases := strings.SplitSeq(aliasStr, ",")
- for alias := range aliases {
- var exist bool
- for _, retAlias := range ret {
- if retAlias == alias {
- exist = true
- }
- }
- if !exist {
- ret = append(ret, alias)
- }
- }
- }
- return
-}
-
func queryNames(searchIgnoreLines []string, boxIDs ...string) (ret []string) {
ret = []string{}
sqlStmt := "SELECT name FROM blocks WHERE name != ''"
@@ -347,22 +314,6 @@ func queryDocTitles(searchIgnoreLines []string, boxIDs ...string) (ret []string)
return
}
-func QueryBlockNamesByRootID(rootID string) (ret []string) {
- sqlStmt := "SELECT DISTINCT name FROM blocks WHERE root_id = ? AND name != ''"
- rows, err := query(sqlStmt, rootID)
- if err != nil {
- logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)
- return
- }
- defer rows.Close()
- for rows.Next() {
- var name string
- rows.Scan(&name)
- ret = append(ret, name)
- }
- return
-}
-
func QueryBookmarkBlocks() (ret []*Block) {
sqlStmt := "SELECT * FROM blocks WHERE ial LIKE ?"
rows, err := query(sqlStmt, "%bookmark=%")
@@ -871,110 +822,6 @@ func selectBlocksRawStmtWithQuery(stmt string, page, limit int, boxID string, qu
return
}
-func SelectBlocksRegex(stmt string, exp *regexp.Regexp, name, alias, memo, ial bool, page, pageSize int) (ret []*Block) {
- rows, err := query(stmt)
- if err != nil {
- logging.LogErrorf("sql query [%s] failed: %s", stmt, err)
- return
- }
- defer rows.Close()
- count := 0
- for rows.Next() {
- count++
- if count <= (page-1)*pageSize {
- continue
- }
-
- var block Block
- if err := rows.Scan(&block.ID, &block.ParentID, &block.RootID, &block.Hash, &block.Box, &block.Path, &block.HPath, &block.Name, &block.Alias, &block.Memo, &block.Tag, &block.Content, &block.FContent, &block.Markdown, &block.Length, &block.Type, &block.SubType, &block.IAL, &block.Sort, &block.Created, &block.Updated); err != nil {
- logging.LogErrorf("query scan field failed: %s\n%s", err, logging.ShortStack())
- return
- }
-
- hitContent := exp.MatchString(block.Content)
- hitName := name && exp.MatchString(block.Name)
- hitAlias := alias && exp.MatchString(block.Alias)
- hitMemo := memo && exp.MatchString(block.Memo)
- hitIAL := ial && exp.MatchString(block.IAL)
- if hitContent || hitName || hitAlias || hitMemo || hitIAL {
- if hitContent {
- block.Content = exp.ReplaceAllString(block.Content, "__@mark__${0}__mark@__")
- }
- if hitName {
- block.Name = exp.ReplaceAllString(block.Name, "__@mark__${0}__mark@__")
- }
- if hitAlias {
- block.Alias = exp.ReplaceAllString(block.Alias, "__@mark__${0}__mark@__")
- }
- if hitMemo {
- block.Memo = exp.ReplaceAllString(block.Memo, "__@mark__${0}__mark@__")
- }
- if hitIAL {
- block.IAL = exp.ReplaceAllString(block.IAL, "__@mark__${0}__mark@__")
- }
-
- ret = append(ret, &block)
- if len(ret) >= pageSize {
- break
- }
- }
- }
- return
-}
-
-// SelectBlocksRegexArgs 与 SelectBlocksRegex 行为一致,但通过绑定参数执行,
-// 绕开 sqlparser 解析(vitess 会把 "?" 改写为 ":vN" 导致占位失效),用于含用户可控参数的正则搜索。
-func SelectBlocksRegexArgs(stmt string, exp *regexp.Regexp, name, alias, memo, ial bool, page, pageSize int, args ...any) (ret []*Block) {
- rows, err := query(stmt, args...)
- if err != nil {
- logging.LogErrorf("sql query [%s] failed: %s", stmt, err)
- return
- }
- defer rows.Close()
- count := 0
- for rows.Next() {
- count++
- if count <= (page-1)*pageSize {
- continue
- }
-
- var block Block
- if err := rows.Scan(&block.ID, &block.ParentID, &block.RootID, &block.Hash, &block.Box, &block.Path, &block.HPath, &block.Name, &block.Alias, &block.Memo, &block.Tag, &block.Content, &block.FContent, &block.Markdown, &block.Length, &block.Type, &block.SubType, &block.IAL, &block.Sort, &block.Created, &block.Updated); err != nil {
- logging.LogErrorf("query scan field failed: %s\n%s", err, logging.ShortStack())
- return
- }
-
- hitContent := exp.MatchString(block.Content)
- hitName := name && exp.MatchString(block.Name)
- hitAlias := alias && exp.MatchString(block.Alias)
- hitMemo := memo && exp.MatchString(block.Memo)
- hitIAL := ial && exp.MatchString(block.IAL)
- if hitContent || hitName || hitAlias || hitMemo || hitIAL {
- if hitContent {
- block.Content = exp.ReplaceAllString(block.Content, "__@mark__${0}__mark@__")
- }
- if hitName {
- block.Name = exp.ReplaceAllString(block.Name, "__@mark__${0}__mark@__")
- }
- if hitAlias {
- block.Alias = exp.ReplaceAllString(block.Alias, "__@mark__${0}__mark@__")
- }
- if hitMemo {
- block.Memo = exp.ReplaceAllString(block.Memo, "__@mark__${0}__mark@__")
- }
- if hitIAL {
- block.IAL = exp.ReplaceAllString(block.IAL, "__@mark__${0}__mark@__")
- }
-
- ret = append(ret, &block)
- if len(ret) >= pageSize {
- break
- }
- }
- }
- return
-}
-
func selectBlocksRawStmt(stmt string, limit int) (ret []*Block) {
return selectBlocksRawStmtNoParseWithQuery(stmt, limit, "", query)
}
diff --git a/kernel/sql/block_ref_query.go b/kernel/sql/block_ref_query.go
index 790c8604db..7fae8f88d6 100644
--- a/kernel/sql/block_ref_query.go
+++ b/kernel/sql/block_ref_query.go
@@ -105,28 +105,6 @@ func queryRefTexts(refSearchIgnoreLines []string, boxIDs ...string) (ret []strin
return
}
-func QueryRefCount(defIDs []string) (ret map[string]int) {
- ret = map[string]int{}
- ids := strings.Join(defIDs, "','")
- ids = "('" + ids + "')"
- rows, err := query("SELECT def_block_id, COUNT(*) AS ref_cnt FROM refs WHERE def_block_id IN " + ids + " GROUP BY def_block_id")
- if err != nil {
- logging.LogErrorf("sql query failed: %s", err)
- return
- }
- defer rows.Close()
- for rows.Next() {
- var id string
- var cnt int
- if err = rows.Scan(&id, &cnt); err != nil {
- logging.LogErrorf("query scan field failed: %s", err)
- return
- }
- ret[id] = cnt
- }
- return
-}
-
// ExistRefByDefIDsInBox 检查指定笔记本索引中是否存在来自删除集合外部的引用。
func ExistRefByDefIDsInBox(defIDs, defRootIDs, excludeBlockIDs, excludeRootIDs []string, boxID string) (ret bool, err error) {
const batchSize = 900
@@ -319,26 +297,6 @@ func QueryBoundBlockAVIDs(blockIDs, rootIDs []string) (ret map[string][]string,
return
}
-func QueryRootChildrenRefCount(defRootID string) (ret map[string]int) {
- ret = map[string]int{}
- rows, err := query("SELECT def_block_id, COUNT(*) AS ref_cnt FROM refs WHERE def_block_root_id = ? GROUP BY def_block_id", defRootID)
- if err != nil {
- logging.LogErrorf("sql query failed: %s", err)
- return
- }
- defer rows.Close()
- for rows.Next() {
- var id string
- var cnt int
- if err = rows.Scan(&id, &cnt); err != nil {
- logging.LogErrorf("query scan field failed: %s", err)
- return
- }
- ret[id] = cnt
- }
- return
-}
-
func QueryRootBlockRefCount() (ret map[string]int) {
ret = map[string]int{}
if nil == db {
@@ -594,29 +552,6 @@ func queryDefIDsByNameAliasAndDocTitle(keyword string) (ret []string) {
return
}
-func QueryChildRefDefIDsByRootDefID(rootDefID string) (ret map[string][]string) {
- ret = map[string][]string{}
- rows, err := query("SELECT block_id, def_block_id FROM refs WHERE def_block_root_id = ?", rootDefID)
- if err != nil {
- logging.LogErrorf("sql query failed: %s", err)
- return
- }
- defer rows.Close()
- for rows.Next() {
- var defID, refID string
- if err = rows.Scan(&defID, &refID); err != nil {
- logging.LogErrorf("query scan field failed: %s", err)
- return
- }
- if nil == ret[defID] {
- ret[defID] = []string{refID}
- } else {
- ret[defID] = append(ret[defID], refID)
- }
- }
- return
-}
-
func QueryChildDefIDsByRootDefID(rootDefID string) (ret []string) {
ret = []string{}
rows, err := query("SELECT DISTINCT(def_block_id) FROM refs WHERE def_block_root_id = ?", rootDefID)
@@ -661,34 +596,6 @@ func QueryRefIDsByDefID(defID string, containChildren bool) (refIDs []string) {
return
}
-func QueryRefsRecent(onlyDoc bool, typeFilter string, ignoreLines []string) (ret []*Ref) {
- stmt := "SELECT r.* FROM refs AS r, blocks AS b WHERE b.id = r.def_block_id AND b.type IN " + typeFilter
- if onlyDoc {
- stmt = "SELECT r.* FROM refs AS r, blocks AS b WHERE b.id = r.def_block_id AND b.type = 'd'"
- }
- if 0 < len(ignoreLines) {
- // Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089
- buf := bytes.Buffer{}
- for _, line := range ignoreLines {
- buf.WriteString(" AND ")
- buf.WriteString(line)
- }
- stmt += buf.String()
- }
- stmt += " GROUP BY r.def_block_id ORDER BY r.id DESC LIMIT 32"
- rows, err := query(stmt)
- if err != nil {
- logging.LogErrorf("sql query failed: %s", err)
- return
- }
- defer rows.Close()
- for rows.Next() {
- ref := scanRefRows(rows)
- ret = append(ret, ref)
- }
- return
-}
-
func QueryRefsByDefID(defBlockID string, containChildren bool) (ret []*Ref) {
var rows *sql.Rows
var err error
@@ -716,21 +623,6 @@ const queryRefsByDefIDWithChildren = `WITH RECURSIVE child_ids(id) AS (
)
SELECT refs.* FROM refs JOIN child_ids ON refs.def_block_id = child_ids.id`
-func QueryRefsByDefIDRefID(defBlockID, refBlockID string) (ret []*Ref) {
- stmt := "SELECT * FROM refs WHERE def_block_id = ? AND block_id = ?"
- rows, err := query(stmt, defBlockID, refBlockID)
- if err != nil {
- logging.LogErrorf("sql query failed: %s", err)
- return
- }
- defer rows.Close()
- for rows.Next() {
- ref := scanRefRows(rows)
- ret = append(ret, ref)
- }
- return
-}
-
func DefRefs(condition string, limit int) (ret []map[*Block]*Block) {
ret = []map[*Block]*Block{}
stmt := "SELECT ref.*, r.block_id || '@' || r.def_block_id AS rel FROM blocks AS ref, refs AS r WHERE ref.id = r.block_id"
diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go
index b62145d296..2aa42dcee4 100644
--- a/kernel/sql/queue.go
+++ b/kernel/sql/queue.go
@@ -611,10 +611,6 @@ func UpsertTreeQueue(tree *parse.Tree) {
appendOperation(newOp)
}
-func RenameTreeQueue(tree *parse.Tree) {
- renameTreeQueue(tree, "rename")
-}
-
// RenameDocQueue 及时更新文档标题,内容块的路径副本由独立后台任务补齐。
func RenameDocQueue(tree *parse.Tree) {
renameTreeQueue(tree, "rename_doc")
diff --git a/kernel/treenode/blocktree.go b/kernel/treenode/blocktree.go
index b35372f688..5067f342ec 100644
--- a/kernel/treenode/blocktree.go
+++ b/kernel/treenode/blocktree.go
@@ -211,25 +211,6 @@ func GetBlockTreesByTypeInBox(typ, boxID string) (ret []*BlockTree) {
return
}
-func GetBlockTreeByBoxPath(boxID, path string) (ret *BlockTree) {
- ret = &BlockTree{}
- sqlStmt := "SELECT * FROM blocktrees WHERE box_id = ? AND path = ?"
- row := queryRowForBox(boxID, sqlStmt, boxID, path)
- if row == nil {
- return
- }
- err := row.Scan(&ret.ID, &ret.RootID, &ret.ParentID, &ret.BoxID, &ret.Path, &ret.HPath, &ret.Updated, &ret.Type)
- if err != nil {
- ret = nil
- if errors.Is(err, sql.ErrNoRows) {
- return
- }
- logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)
- return
- }
- return
-}
-
func CountTrees() (ret int) {
sqlStmt := "SELECT COUNT(*) FROM blocktrees WHERE type = 'd'"
err := scanQueryRow(queryRow(sqlStmt), &ret)
@@ -559,22 +540,6 @@ func RemoveBlockTreesByRootID(boxID, rootID string) {
}
}
-func CountBlockTreesByPathPrefix(boxID, pathPrefix string) (ret int) {
- sqlStmt := "SELECT COUNT(*) FROM blocktrees WHERE path LIKE ? AND box_id = ?"
- row := queryRowForBox(boxID, sqlStmt, pathPrefix+"%", boxID)
- if row == nil {
- return
- }
- err := row.Scan(&ret)
- if err != nil {
- if errors.Is(err, sql.ErrNoRows) {
- return 0
- }
- logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)
- }
- return
-}
-
func GetBlockTreesByPathPrefix(boxID, pathPrefix string) (ret []*BlockTree) {
sqlStmt := "SELECT * FROM blocktrees WHERE path LIKE ? AND box_id = ?"
rows, err := queryForBox(boxID, sqlStmt, pathPrefix+"%", boxID)
diff --git a/kernel/util/misc.go b/kernel/util/misc.go
index 57fda68fc3..4f42d477bd 100644
--- a/kernel/util/misc.go
+++ b/kernel/util/misc.go
@@ -47,8 +47,6 @@ type Optional[T any] struct {
func (o Optional[T]) IsZero() bool { return !o.Exists }
-func (o Optional[T]) IsNullValue() bool { return o.Exists && o.IsNull }
-
func (o Optional[T]) HasValue() bool { return o.Exists && !o.IsNull }
func (o *Optional[T]) UnmarshalJSON(data []byte) error {
diff --git a/kernel/util/net.go b/kernel/util/net.go
index 6e5d40c700..6f9f8621bf 100644
--- a/kernel/util/net.go
+++ b/kernel/util/net.go
@@ -409,33 +409,6 @@ func GetRequestUrlStringParam(c *gin.Context, key string) string {
return ""
}
-// GetRequestStringParam extracts a string parameter from the request (URL or JSON body), with validation and error handling.
-func GetRequestStringParam(c *gin.Context, key string, result *gulu.Result) string {
- // /path/:name
- if value := GetRequestUrlStringParam(c, key); value != "" {
- return value
- }
-
- // /path with JSON body {key: "xxx"}
- arg, ok := JsonArg(c, result)
- if !ok {
- return ""
- }
- if arg[key] == nil {
- result.Code = 1
- result.Msg = fmt.Sprintf("Request body prop [%s] does not exist", key)
- return ""
- }
-
- value, ok := arg[key].(string)
- if !ok {
- result.Code = 2
- result.Msg = fmt.Sprintf("Request body prop [%s] is not a string", key)
- return ""
- }
- return value
-}
-
// ParseJsonArg 使用泛型从 JSON 参数中提取指定键的值。
// - 如果 required 为 true 但参数缺失,则会在 ret.Msg 中说明需要传入的键
// - 如果 rejectEmpty 为 true 但参数值为空,则会在 ret.Msg 中说明该键必须不为空(字符串去空白后、空数组、无任何键的对象)
diff --git a/kernel/util/openai.go b/kernel/util/openai.go
index c8c9c7527a..851eafea48 100644
--- a/kernel/util/openai.go
+++ b/kernel/util/openai.go
@@ -450,26 +450,6 @@ func firstValidModelContextLength(values ...json.RawMessage) int {
return 0
}
-func IsNetworkError(err error) bool {
- msg := strings.ToLower(err.Error())
- return strings.Contains(msg, "actively refused") ||
- strings.Contains(msg, "connection refused") ||
- strings.Contains(msg, "no such host") ||
- strings.Contains(msg, "connection failed") ||
- strings.Contains(msg, "hostname resolution") ||
- strings.Contains(msg, "no address associated with hostname") ||
- strings.Contains(msg, "request canceled while waiting for connection") ||
- strings.Contains(msg, "exceeded while awaiting") ||
- strings.Contains(msg, "context deadline exceeded") ||
- strings.Contains(msg, "timeout") ||
- strings.Contains(msg, "connection") ||
- strings.Contains(msg, "refused") ||
- strings.Contains(msg, "socket") ||
- strings.Contains(msg, "eof") ||
- strings.Contains(msg, "closed") ||
- strings.Contains(msg, "network")
-}
-
// embeddingHTTPClient 单例 HTTP 客户端,复用连接池并限制每主机最大连接数,
// 避免 embedding 索引器在 API 不可用时新建大量连接形成连接风暴。
// 单次请求超时由调用方用 context.WithTimeout 控制,client 本身不设全局 Timeout。
diff --git a/kernel/util/plugin_development.go b/kernel/util/plugin_development.go
index 694d7f7c29..f742e828c3 100644
--- a/kernel/util/plugin_development.go
+++ b/kernel/util/plugin_development.go
@@ -189,11 +189,6 @@ func IsPluginDevelopmentRawPathForbidden(abs string, ancestors bool) bool {
var pluginProjectLocks sync.Map
-// WithPluginProjectLock 串行化受管项目内的写入、冻结与恢复;不阻止不遵守协议的外部编辑器。
-func WithPluginProjectLock(taskID string, fn func() error) error {
- return WithPluginProjectLockContext(context.Background(), taskID, fn)
-}
-
func WithPluginProjectLockContext(ctx context.Context, taskID string, fn func() error) error {
value, _ := pluginProjectLocks.LoadOrStore(taskID, make(chan struct{}, 1))
lock := value.(chan struct{})
diff --git a/kernel/util/sort.go b/kernel/util/sort.go
index 6497199c47..31acfe8cfd 100644
--- a/kernel/util/sort.go
+++ b/kernel/util/sort.go
@@ -104,13 +104,6 @@ func UTF82GBK(src string) ([]byte, error) {
return io.ReadAll(transform.NewReader(bytes.NewReader([]byte(src)), GB18030.NewEncoder()))
}
-// GBK2UTF8 transform GBK byte array into UTF8 string.
-func GBK2UTF8(src []byte) (string, error) {
- GB18030 := simplifiedchinese.All[0]
- bytes, err := io.ReadAll(transform.NewReader(bytes.NewReader(src), GB18030.NewDecoder()))
- return string(bytes), err
-}
-
const (
SortModeNameASC = iota // 0:文件名字母升序
SortModeNameDESC // 1:文件名字母降序