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

🎨 数据历史文档中支持操作类型过滤 https://github.com/siyuan-note/siyuan/issues/5754

Browse source
This commit is contained in:
Liang Ding 2022-08-29 23:46:46 +08:00
parent 5be606ad3c
commit 05c0de4922
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 25 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

47
kernel/model/history.go
View file

@ -262,21 +262,7 @@ type HistoryItem struct {
Path string `json:"path"`
}
func GetDocHistory(boxID string, page int) (ret []*History, err error) {
pageSize := 32
from := (page - 1) * pageSize
to := page * pageSize
table := "histories_fts_case_insensitive"
projections := "type, op, title, content, path, created"
stmt := "SELECT " + projections + " FROM " + table + " WHERE path LIKE '%/" + boxID + "/%.sy'"
stmt += " ORDER BY created DESC LIMIT " + strconv.Itoa(from) + ", " + strconv.Itoa(to)
sqlHistories := sql.SelectHistoriesRawStmt(stmt)
ret = fromSQLHistories(sqlHistories)
return
}
func FullTextSearchHistory(query, op string, page int) (ret []*History, pageCount, totalCount int) {
func FullTextSearchHistory(query, box, op string, typ, page int) (ret []*History, pageCount, totalCount int) {
query = gulu.Str.RemoveInvisible(query)
query = stringQuery(query)
@ -289,6 +275,12 @@ func FullTextSearchHistory(query, op string, page int) (ret []*History, pageCoun
if "all" != op {
stmt += " AND op = '" + op + "'"
}
if HistoryTypeDoc == typ {
stmt += " AND path LIKE '%/" + box + "/%'"
} else if HistoryTypeAsset == typ {
stmt += " AND path LIKE '%/assets/%'"
}
countStmt := strings.ReplaceAll(stmt, "SELECT *", "SELECT COUNT(*) AS total")
stmt += " ORDER BY created DESC LIMIT " + strconv.Itoa(from) + ", " + strconv.Itoa(to)
sqlHistories := sql.SelectHistoriesRawStmt(stmt)
@ -300,7 +292,7 @@ func FullTextSearchHistory(query, op string, page int) (ret []*History, pageCoun
if 1 > len(result) {
return
}
totalCount = int(result[0]["matches"].(int64))
totalCount = int(result[0]["total"].(int64))
pageCount = int(math.Ceil(float64(totalCount) / float64(pageSize)))
return
}
@ -357,20 +349,6 @@ func GetNotebookHistory() (ret []*History, err error) {
return
}
func GetAssetsHistory(page int) (ret []*History, err error) {
pageSize := 32
from := (page - 1) * pageSize
to := page * pageSize
table := "histories_fts_case_insensitive"
projections := "type, op, title, content, path, created"
stmt := "SELECT " + projections + " FROM " + table + " WHERE path LIKE '%/assets/%'"
stmt += " ORDER BY created DESC LIMIT " + strconv.Itoa(from) + ", " + strconv.Itoa(to)
sqlHistories := sql.SelectHistoriesRawStmt(stmt)
ret = fromSQLHistories(sqlHistories)
return
}
func (box *Box) generateDocHistory0() {
files := box.recentModifiedDocs()
if 1 > len(files) {
@ -528,6 +506,11 @@ func ReindexHistory() (err error) {
var validOps = []string{HistoryOpClean, HistoryOpUpdate, HistoryOpDelete, HistoryOpFormat, HistoryOpSync}
const (
HistoryTypeDoc = 0
HistoryTypeAsset = 1
)
func indexHistoryDir(name string, luteEngine *lute.Lute) (err error) {
op := name[strings.LastIndex(name, "-")+1:]
if !gulu.Str.Contains(op, validOps) {
@ -566,7 +549,7 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) (err error) {
p := strings.TrimPrefix(doc, util.HistoryDir)
p = filepath.ToSlash(p[1:])
histories = append(histories, &sql.History{
Type: 0,
Type: HistoryTypeDoc,
Op: op,
Title: title,
Content: content,
@ -579,7 +562,7 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) (err error) {
p := strings.TrimPrefix(asset, util.HistoryDir)
p = filepath.ToSlash(p[1:])
histories = append(histories, &sql.History{
Type: 1,
Type: HistoryTypeAsset,
Op: op,
Title: filepath.Base(asset),
Path: p,