Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-19 06:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

✨ Support for searching asset content https://github.com/siyuan-note/siyuan/issues/8874

Browse source
This commit is contained in:
Daniel 2023-08-11 10:19:11 +08:00
parent d10431d27a
commit 298b95dea3
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 66 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/sql/asset_content_query.go
View file

@ -26,7 +26,7 @@ import (
"github.com/siyuan-note/logging"
)
func SelectAssetContentsRawStmt(stmt string, page, limit int) (ret []*Block) {
func SelectAssetContentsRawStmt(stmt string, page, limit int) (ret []*AssetContent) {
parsedStmt, err := sqlparser.Parse(stmt)
if nil != err {
return selectAssetContentsRawStmt(stmt, limit)
@ -83,14 +83,18 @@ func SelectAssetContentsRawStmt(stmt string, page, limit int) (ret []*Block) {
}
defer rows.Close()
for rows.Next() {
if block := scanAssetContentRows(rows); nil != block {
ret = append(ret, block)
if ac := scanAssetContentRows(rows); nil != ac {
ret = append(ret, ac)
}
}
return
}
func selectAssetContentsRawStmt(stmt string, limit int) (ret []*Block) {
func SelectAssetContentsRawStmtNoParse(stmt string, limit int) (ret []*AssetContent) {
return selectAssetContentsRawStmt(stmt, limit)
}
func selectAssetContentsRawStmt(stmt string, limit int) (ret []*AssetContent) {
rows, err := queryAssetContent(stmt)
if nil != err {
if strings.Contains(err.Error(), "syntax error") {
@ -104,8 +108,8 @@ func selectAssetContentsRawStmt(stmt string, limit int) (ret []*Block) {
var count, errCount int
for rows.Next() {
count++
if block := scanAssetContentRows(rows); nil != block {
ret = append(ret, block)
if ac := scanAssetContentRows(rows); nil != ac {
ret = append(ret, ac)
} else {
logging.LogWarnf("raw sql query [%s] failed", stmt)
errCount++
@ -119,13 +123,12 @@ func selectAssetContentsRawStmt(stmt string, limit int) (ret []*Block) {
}
func scanAssetContentRows(rows *sql.Rows) (ret *AssetContent) {
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); nil != err {
var ac AssetContent
if err := rows.Scan(&ac.ID, &ac.Name, &ac.Ext, &ac.Path, &ac.Size, &ac.Updated, &ac.Content); nil != err {
logging.LogErrorf("query scan field failed: %s\n%s", err, logging.ShortStack())
return
}
ret = &block
putBlockCache(ret)
ret = &ac
return
}