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

🎨 Support for opening file history on the doc tree https://github.com/siyuan-note/siyuan/issues/8448

Browse source
This commit is contained in:
Daniel 2023-06-03 21:22:30 +08:00
parent f99d9e19bc
commit 772c809e31
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kernel/model/history.go
View file

@ -337,6 +337,8 @@ func FullTextSearchHistory(query, box, op string, typ, page int) (ret []string,
stmt += " AND op = '" + op + "'"
}
stmt += " AND path LIKE '%/" + box + "/%' AND path LIKE '%.sy'"
} else if HistoryTypeDocID == typ {
stmt += " AND id = '" + query + "'"
} else if HistoryTypeAsset == typ {
stmt += " AND path LIKE '%/assets/%'"
}
@ -387,6 +389,8 @@ func FullTextSearchHistoryItems(created, query, box, op string, typ int) (ret []
stmt += " AND op = '" + op + "'"
}
stmt += " AND path LIKE '%/" + box + "/%' AND path LIKE '%.sy'"
} else if HistoryTypeDocID == typ {
stmt += " AND id = '" + query + "'"
} else if HistoryTypeAsset == typ {
stmt += " AND path LIKE '%/assets/%'"
}
@ -592,9 +596,10 @@ func ReindexHistory() (err error) {
var validOps = []string{HistoryOpClean, HistoryOpUpdate, HistoryOpDelete, HistoryOpFormat, HistoryOpSync, HistoryOpReplace}
const (
HistoryTypeDocName = 0
HistoryTypeDoc = 1
HistoryTypeAsset = 2
HistoryTypeDocName = 0 // Search docs by doc name
HistoryTypeDoc = 1 // Search docs by doc name and content
HistoryTypeAsset = 2 // Search assets
HistoryTypeDocID = 3 // Search docs by doc id
)
func indexHistoryDir(name string, luteEngine *lute.Lute) {
@ -640,6 +645,7 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) {
p := strings.TrimPrefix(doc, util.HistoryDir)
p = filepath.ToSlash(p[1:])
histories = append(histories, &sql.History{
ID: tree.Root.ID,
Type: HistoryTypeDoc,
Op: op,
Title: title,
@ -652,7 +658,12 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) {
for _, asset := range assets {
p := strings.TrimPrefix(asset, util.HistoryDir)
p = filepath.ToSlash(p[1:])
_, id := util.LastID(asset)
if !ast.IsNodeIDPattern(id) {
id = ""
}
histories = append(histories, &sql.History{
ID: id,
Type: HistoryTypeAsset,
Op: op,
Title: filepath.Base(asset),