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

kernel/model/asset_content.go

@@ -116,8 +116,8 @@ func assetContentFieldRegexp(exp string) string {
 func fullTextSearchAssetContentCountByRegexp(exp, typeFilter string) (matchedAssetCount int) {
 	table := "asset_contents_fts_case_insensitive"
 	fieldFilter := fieldRegexp(exp)
-	stmt := "SELECT COUNT(path) AS `assets` FROM `" + table + "` WHERE " + fieldFilter + " AND type IN " + typeFilter
+	stmt := "SELECT COUNT(path) AS `assets` FROM `" + table + "` WHERE " + fieldFilter + " AND ext IN " + typeFilter
-	result, _ := sql.QueryNoLimit(stmt)
+	result, _ := sql.QueryAssetContentNoLimit(stmt)
 	if 1 > len(result) {
 		return
 	}
@@ -130,7 +130,7 @@ func fullTextSearchAssetContentByFTS(query, typeFilter, orderBy string, beforeLe
 	projections := "id, name, ext, path, size, updated, " +
 		"highlight(" + table + ", 6, '<mark>', '</mark>') AS content"
 	stmt := "SELECT " + projections + " FROM " + table + " WHERE (`" + table + "` MATCH '" + buildAssetContentColumnFilter() + ":(" + query + ")'"
-	stmt += ") AND type IN " + typeFilter
+	stmt += ") AND ext IN " + typeFilter
 	stmt += " " + orderBy
 	stmt += " LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa((page-1)*pageSize)
 	assetContents := sql.SelectAssetContentsRawStmt(stmt, page, pageSize)
@@ -156,7 +156,7 @@ func searchAssetContentBySQL(stmt string, beforeLen, page, pageSize int) (ret []
 	stmt = strings.ToLower(stmt)
 	stmt = strings.ReplaceAll(stmt, "select * ", "select COUNT(path) AS `assets` ")
 	stmt = removeLimitClause(stmt)
-	result, _ := sql.QueryNoLimit(stmt)
+	result, _ := sql.QueryAssetContentNoLimit(stmt)
 	if 1 > len(ret) {
 		return
 	}
@@ -170,8 +170,8 @@ func fullTextSearchAssetContentCount(query, typeFilter string) (matchedAssetCoun
 
 	table := "asset_contents_fts_case_insensitive"
 	stmt := "SELECT COUNT(path) AS `assets` FROM `" + table + "` WHERE (`" + table + "` MATCH '" + buildAssetContentColumnFilter() + ":(" + query + ")'"
-	stmt += ") AND type IN " + typeFilter
+	stmt += ") AND ext IN " + typeFilter
-	result, _ := sql.QueryNoLimit(stmt)
+	result, _ := sql.QueryAssetContentNoLimit(stmt)
 	if 1 > len(result) {
 		return
 	}

kernel/sql/asset_content_query.go

@@ -19,6 +19,7 @@ package sql
 import (
 	"database/sql"
 	"errors"
+	"math"
 	"strconv"
 	"strings"
 
@@ -26,6 +27,53 @@ import (
 	"github.com/siyuan-note/logging"
 )
 
+func QueryAssetContentNoLimit(stmt string) (ret []map[string]interface{}, err error) {
+	return queryAssetContentRawStmt(stmt, math.MaxInt)
+}
+
+func queryAssetContentRawStmt(stmt string, limit int) (ret []map[string]interface{}, err error) {
+	rows, err := queryAssetContent(stmt)
+	if nil != err {
+		if strings.Contains(err.Error(), "syntax error") {
+			return
+		}
+		return
+	}
+	defer rows.Close()
+
+	cols, err := rows.Columns()
+	if nil != err || nil == cols {
+		return
+	}
+
+	noLimit := !strings.Contains(strings.ToLower(stmt), " limit ")
+	var count, errCount int
+	for rows.Next() {
+		columns := make([]interface{}, len(cols))
+		columnPointers := make([]interface{}, len(cols))
+		for i := range columns {
+			columnPointers[i] = &columns[i]
+		}
+
+		if err = rows.Scan(columnPointers...); nil != err {
+			return
+		}
+
+		m := make(map[string]interface{})
+		for i, colName := range cols {
+			val := columnPointers[i].(*interface{})
+			m[colName] = *val
+		}
+
+		ret = append(ret, m)
+		count++
+		if (noLimit && limit < count) || 0 < errCount {
+			break
+		}
+	}
+	return
+}
+
 func SelectAssetContentsRawStmt(stmt string, page, limit int) (ret []*AssetContent) {
 	parsedStmt, err := sqlparser.Parse(stmt)
 	if nil != err {