Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-26 11:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Move supports searching by document block ID https://github.com/siyuan-note/siyuan/issues/16674

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-23 17:10:41 +08:00
parent 6f81350279
commit 5cf09d8043
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 41 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/api/filetree.go
View file

@ -1043,7 +1043,7 @@ func searchDocs(c *gin.Context) {
}
k := arg["k"].(string)
ret.Data = model.SearchDocsByKeyword(k, flashcard, excludeIDs)
ret.Data = model.SearchDocs(k, flashcard, excludeIDs)
}
func listDocsByPath(c *gin.Context) {

74
kernel/model/file.go
View file

@ -139,7 +139,7 @@ func (box *Box) moveCorruptedData(filePath string) {
logging.LogWarnf("moved corrupted data file [%s] to [%s]", filePath, to)
}
func SearchDocsByKeyword(keyword string, flashcard bool, excludeIDs []string) (ret []map[string]string) {
func SearchDocs(keyword string, flashcard bool, excludeIDs []string) (ret []map[string]string) {
ret = []map[string]string{}
var deck *riff.Deck
@ -159,11 +159,46 @@ func SearchDocsByKeyword(keyword string, flashcard bool, excludeIDs []string) (r
boxes[box.ID] = box
}
keywords := strings.Fields(keyword)
keyword = strings.TrimSpace(keyword)
var rootBlocks []*sql.Block
if 0 < len(keywords) {
for _, box := range boxes {
if gulu.Str.Contains(box.Name, keywords) {
if ast.IsNodeIDPattern(keyword) {
rootBlocks = sql.QueryRootBlockByCondition("id='"+keyword+"'", 1)
} else {
keywords := strings.Fields(keyword)
if 0 < len(keywords) {
for _, box := range boxes {
if gulu.Str.Contains(box.Name, keywords) {
if flashcard {
newFlashcardCount, dueFlashcardCount, flashcardCount := countBoxFlashcard(box.ID, deck, deckBlockIDs)
if 0 < flashcardCount {
ret = append(ret, map[string]string{"path": "/", "hPath": box.Name + "/", "box": box.ID, "boxIcon": box.Icon, "newFlashcardCount": strconv.Itoa(newFlashcardCount), "dueFlashcardCount": strconv.Itoa(dueFlashcardCount), "flashcardCount": strconv.Itoa(flashcardCount)})
}
} else {
ret = append(ret, map[string]string{"path": "/", "hPath": box.Name + "/", "box": box.ID, "boxIcon": box.Icon})
}
}
}
var condition string
for i, k := range keywords {
condition += "(hpath LIKE '%" + k + "%'"
namCondition := Conf.Search.NAMFilter(k)
condition += " " + namCondition
condition += ")"
if i < len(keywords)-1 {
condition += " AND "
}
}
for _, excludeID := range excludeIDs {
condition += fmt.Sprintf(" AND path NOT LIKE '%%%s%%' ", excludeID)
}
rootBlocks = sql.QueryRootBlockByCondition(condition, Conf.Search.Limit)
} else {
for _, box := range boxes {
if flashcard {
newFlashcardCount, dueFlashcardCount, flashcardCount := countBoxFlashcard(box.ID, deck, deckBlockIDs)
if 0 < flashcardCount {
@ -174,35 +209,6 @@ func SearchDocsByKeyword(keyword string, flashcard bool, excludeIDs []string) (r
}
}
}
var condition string
for i, k := range keywords {
condition += "(hpath LIKE '%" + k + "%'"
namCondition := Conf.Search.NAMFilter(k)
condition += " " + namCondition
condition += ")"
if i < len(keywords)-1 {
condition += " AND "
}
}
for _, excludeID := range excludeIDs {
condition += fmt.Sprintf(" AND path NOT LIKE '%%%s%%' ", excludeID)
}
rootBlocks = sql.QueryRootBlockByCondition(condition, Conf.Search.Limit)
} else {
for _, box := range boxes {
if flashcard {
newFlashcardCount, dueFlashcardCount, flashcardCount := countBoxFlashcard(box.ID, deck, deckBlockIDs)
if 0 < flashcardCount {
ret = append(ret, map[string]string{"path": "/", "hPath": box.Name + "/", "box": box.ID, "boxIcon": box.Icon, "newFlashcardCount": strconv.Itoa(newFlashcardCount), "dueFlashcardCount": strconv.Itoa(dueFlashcardCount), "flashcardCount": strconv.Itoa(flashcardCount)})
}
} else {
ret = append(ret, map[string]string{"path": "/", "hPath": box.Name + "/", "box": box.ID, "boxIcon": box.Icon})
}
}
}
for _, rootBlock := range rootBlocks {