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

🎨 Improve upload assets to cloud

Browse source
This commit is contained in:
Daniel 2024-01-01 16:54:00 +08:00
parent b9f1da33f0
commit fdb0600dbb
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
kernel/model/assets.go
View file

@ -514,12 +514,17 @@ func UploadAssets2Cloud(rootID string) (count int, err error) {
return
}
sqlAssets := sql.QueryRootBlockAssets(rootID)
err = uploadAssets2Cloud(sqlAssets, bizTypeUploadAssets)
tree, err := loadTreeByBlockID(rootID)
if nil != err {
return
}
count = len(sqlAssets)
assets := assetsLinkDestsInTree(tree)
err = uploadAssets2Cloud(assets, bizTypeUploadAssets)
if nil != err {
return
}
count = len(assets)
return
}
@ -529,17 +534,17 @@ const (
)
// uploadAssets2Cloud 将资源文件上传到云端图床。
func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) {
func uploadAssets2Cloud(assetPaths []string, bizType string) (err error) {
var uploadAbsAssets []string
for _, asset := range sqlAssets {
for _, assetPath := range assetPaths {
var absPath string
absPath, err = GetAssetAbsPath(asset.Path)
absPath, err = GetAssetAbsPath(assetPath)
if nil != err {
logging.LogWarnf("get asset [%s] abs path failed: %s", asset, err)
logging.LogWarnf("get asset [%s] abs path failed: %s", assetPath, err)
return
}
if "" == absPath {
logging.LogErrorf("not found asset [%s]", asset)
logging.LogErrorf("not found asset [%s]", assetPath)
continue
}