0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve asset content searching

Browse source
This commit is contained in:
Daniel 2023-08-20 11:01:00 +08:00
parent 43f16f2c5c
commit 71f87cfd55
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kernel/model/asset_content.go
View file

@ -76,6 +76,7 @@ func GetAssetContent(id, query string, queryMethod int) (ret *AssetContent) {
return
}
ret = results[0]
ret.Content = strings.ReplaceAll(ret.Content, "\n", "<br>")
return
}
@ -494,20 +495,26 @@ func (parser *TxtAssetParser) Parse(absPath string) (ret *AssetParseResult) {
return
}
data, err := filelock.ReadFile(absPath)
tmp := copyTempAsset(absPath)
if "" == tmp {
return
}
defer os.RemoveAll(tmp)
data, err := os.ReadFile(tmp)
if nil != err {
logging.LogErrorf("read file [%s] failed: %s", absPath, err)
return
}
content := normalizeAssetContent(string(data))
content := string(data)
ret = &AssetParseResult{
Content: content,
}
return
}
func normalizeAssetContent(content string) (ret string) {
func normalizeNonTxtAssetContent(content string) (ret string) {
ret = strings.Join(strings.Fields(content), " ")
return
}
@ -566,7 +573,7 @@ func (parser *DocxAssetParser) Parse(absPath string) (ret *AssetParseResult) {
return
}
var content = normalizeAssetContent(data)
var content = normalizeNonTxtAssetContent(data)
ret = &AssetParseResult{
Content: content,
}
@ -604,7 +611,7 @@ func (parser *PptxAssetParser) Parse(absPath string) (ret *AssetParseResult) {
return
}
var content = normalizeAssetContent(data)
var content = normalizeNonTxtAssetContent(data)
ret = &AssetParseResult{
Content: content,
}
@ -651,7 +658,7 @@ func (parser *XlsxAssetParser) Parse(absPath string) (ret *AssetParseResult) {
}
}
var content = normalizeAssetContent(buf.String())
var content = normalizeNonTxtAssetContent(buf.String())
ret = &AssetParseResult{
Content: content,
}
@ -744,7 +751,7 @@ func (parser *PdfAssetParser) Parse(absPath string) (ret *AssetParseResult) {
logging.LogErrorf("convert [%s] failed: [%s]", tmp, err)
return
}
content += " " + normalizeAssetContent(pt.Text)
content += " " + normalizeNonTxtAssetContent(pt.Text)
}
ret = &AssetParseResult{
@ -784,7 +791,7 @@ func (parser *EpubAssetParser) Parse(absPath string) (ret *AssetParseResult) {
return
}
content := normalizeAssetContent(buf.String())
content := normalizeNonTxtAssetContent(buf.String())
ret = &AssetParseResult{
Content: content,
}