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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2025-12-03 19:09:29 +08:00
commit f259ecd3bd
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/api/setting.go
View file

@ -326,6 +326,7 @@ func setEditor(c *gin.Context) {
model.Conf.Save()
if oldGenerateHistoryInterval != model.Conf.Editor.GenerateHistoryInterval {
model.GenerateFileHistory()
model.ChangeHistoryTick(editor.GenerateHistoryInterval)
}

4
kernel/model/file.go
View file

@ -187,8 +187,8 @@ func SearchDocsByKeyword(keyword string, flashcard bool, excludeIDs []string) (r
}
}
if 0 < len(excludeIDs) {
condition += fmt.Sprintf(" AND root_id NOT IN ('%s')", strings.Join(excludeIDs, "', '"))
for _, excludeID := range excludeIDs {
condition += fmt.Sprintf(" AND path NOT LIKE '%%%s%%' ", excludeID)
}
rootBlocks = sql.QueryRootBlockByCondition(condition, Conf.Search.Limit)

4
kernel/model/history.go
View file

@ -54,11 +54,11 @@ func AutoGenerateFileHistory() {
ChangeHistoryTick(Conf.Editor.GenerateHistoryInterval)
for {
<-historyTicker.C
task.AppendTask(task.HistoryGenerateFile, generateFileHistory)
task.AppendTask(task.HistoryGenerateFile, GenerateFileHistory)
}
}
func generateFileHistory() {
func GenerateFileHistory() {
defer logging.Recover()
if 1 > Conf.Editor.GenerateHistoryInterval {