mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-04 10:01:56 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
d241569b4c
@ -531,7 +531,6 @@ func exportMarkdownZip(boxID, baseFolderName string, docPaths []string) (zipPath
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
copiedAssets := hashset.New()
|
|
||||||
luteEngine := util.NewLute()
|
luteEngine := util.NewLute()
|
||||||
for _, p := range docPaths {
|
for _, p := range docPaths {
|
||||||
docIAL := box.docIAL(p)
|
docIAL := box.docIAL(p)
|
||||||
@ -572,10 +571,6 @@ func exportMarkdownZip(boxID, baseFolderName string, docPaths []string) (zipPath
|
|||||||
asset = asset[:strings.LastIndex(asset, "?")]
|
asset = asset[:strings.LastIndex(asset, "?")]
|
||||||
}
|
}
|
||||||
|
|
||||||
if copiedAssets.Contains(asset) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
srcPath, err := GetAssetAbsPath(asset)
|
srcPath, err := GetAssetAbsPath(asset)
|
||||||
if nil != err {
|
if nil != err {
|
||||||
util.LogWarnf("get asset [%s] abs path failed: %s", asset, err)
|
util.LogWarnf("get asset [%s] abs path failed: %s", asset, err)
|
||||||
@ -592,8 +587,6 @@ func exportMarkdownZip(boxID, baseFolderName string, docPaths []string) (zipPath
|
|||||||
util.LogErrorf("copy asset from [%s] to [%s] failed: %s", srcPath, destPath, err)
|
util.LogErrorf("copy asset from [%s] to [%s] failed: %s", srcPath, destPath, err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
copiedAssets.Add(asset)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user