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

🐛 清理未引用资源时未忽略 custom-data-assets 属性定义的资源文件 Fix https://github.com/siyuan-note/siyuan/issues/4122

Browse source
This commit is contained in:
Liang Ding 2022-06-14 15:06:41 +08:00
parent 14f8ba10a9
commit 02b0c553e3
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/assets.go
View file

@ -550,7 +550,11 @@ func assetsLinkDestsInTree(tree *parse.Tree) (ret []string) {
ret = append(ret, dest) ret = append(ret, dest)
} else { } else {
if ast.NodeWidget == n.Type { if ast.NodeWidget == n.Type {
dataAssets := n.IALAttr("data-assets") dataAssets := n.IALAttr("custom-data-assets")
if "" == dataAssets {
// 兼容两种属性名 custom-data-assets 和 data-assets https://github.com/siyuan-note/siyuan/issues/4122#issuecomment-1154796568
dataAssets = n.IALAttr("data-assets")
}
if "" == dataAssets || !isRelativePath([]byte(dataAssets)) { if "" == dataAssets || !isRelativePath([]byte(dataAssets)) {
return ast.WalkContinue return ast.WalkContinue
} }

2
kernel/sql/database.go
View file

@ -578,7 +578,7 @@ func buildSpanFromNode(n *ast.Node, tree *parse.Tree, rootID, boxID, p string) (
var src []byte var src []byte
for _, attr := range nodes[0].Attr { for _, attr := range nodes[0].Attr {
if "src" == attr.Key || "data-assets" == attr.Key { if "src" == attr.Key || "data-assets" == attr.Key || "custom-data-assets" == attr.Key {
src = gulu.Str.ToBytes(attr.Val) src = gulu.Str.ToBytes(attr.Val)
break break
} }