Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 数据历史文档和资源文件支持分页和搜索 https://github.com/siyuan-note/siyuan/issues/4901

Browse source
This commit is contained in:
Liang Ding 2022-08-29 00:17:29 +08:00
parent 710b2d633c
commit 07e74577ff
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
kernel/api/history.go
View file

@ -26,6 +26,35 @@ import (
"github.com/siyuan-note/siyuan/kernel/util" "github.com/siyuan-note/siyuan/kernel/util"
) )
func searchHistory(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
query := arg["query"].(string)
page := int(arg["page"].(float64))
histories := model.FullTextSearchHistory(query, page)
ret.Data = map[string]interface{}{
"histories": histories,
}
}
func reindexHistory(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
err := model.ReindexHistory()
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
}
func getNotebookHistory(c *gin.Context) { func getNotebookHistory(c *gin.Context) {
ret := gulu.Ret.NewResult() ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret) defer c.JSON(http.StatusOK, ret)

2
kernel/api/router.go
View file

@ -101,6 +101,8 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/history/getDocHistoryContent", model.CheckAuth, getDocHistoryContent) ginServer.Handle("POST", "/api/history/getDocHistoryContent", model.CheckAuth, getDocHistoryContent)
ginServer.Handle("POST", "/api/history/rollbackDocHistory", model.CheckAuth, model.CheckReadonly, rollbackDocHistory) ginServer.Handle("POST", "/api/history/rollbackDocHistory", model.CheckAuth, model.CheckReadonly, rollbackDocHistory)
ginServer.Handle("POST", "/api/history/clearWorkspaceHistory", model.CheckAuth, model.CheckReadonly, clearWorkspaceHistory) ginServer.Handle("POST", "/api/history/clearWorkspaceHistory", model.CheckAuth, model.CheckReadonly, clearWorkspaceHistory)
ginServer.Handle("POST", "/api/history/reindexHistory", model.CheckAuth, model.CheckReadonly, reindexHistory)
ginServer.Handle("POST", "/api/history/searchHistory", model.CheckAuth, model.CheckReadonly, searchHistory)
ginServer.Handle("POST", "/api/outline/getDocOutline", model.CheckAuth, getDocOutline) ginServer.Handle("POST", "/api/outline/getDocOutline", model.CheckAuth, getDocOutline)
ginServer.Handle("POST", "/api/bookmark/getBookmark", model.CheckAuth, getBookmark) ginServer.Handle("POST", "/api/bookmark/getBookmark", model.CheckAuth, getBookmark)

5
kernel/model/history.go
View file

@ -611,7 +611,7 @@ func GetHistoryDir(suffix string) (ret string, err error) {
return return
} }
func indexHistory() { func ReindexHistory() (err error) {
historyDirs, err := os.ReadDir(util.HistoryDir) historyDirs, err := os.ReadDir(util.HistoryDir)
if nil != err { if nil != err {
logging.LogErrorf("read history dir [%s] failed: %s", util.HistoryDir, err) logging.LogErrorf("read history dir [%s] failed: %s", util.HistoryDir, err)
@ -630,6 +630,7 @@ func indexHistory() {
return return
} }
} }
return
} }
var validOps = []string{HistoryOpClean, HistoryOpUpdate, HistoryOpDelete, HistoryOpFormat} var validOps = []string{HistoryOpClean, HistoryOpUpdate, HistoryOpDelete, HistoryOpFormat}
@ -713,7 +714,7 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) (err error) {
return return
} }
func fullTextSearchHistory(query string, page int) (ret []*History, matchedBlockCount, matchedRootCount int) { func FullTextSearchHistory(query string, page int) (ret []*History) {
query = gulu.Str.RemoveInvisible(query) query = gulu.Str.RemoveInvisible(query)
query = stringQuery(query) query = stringQuery(query)