From 869849ce1bd6c4f6f455789e716a0f4c4cb476ce Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 5 Jan 2026 11:21:07 +0800 Subject: [PATCH] :art: Fix https://github.com/siyuan-note/siyuan/issues/16654#issuecomment-3708672347 Signed-off-by: Daniel <845765@qq.com> --- kernel/api/asset.go | 19 ++++++++++++------- kernel/model/assets.go | 21 ++++++++++++++------- kernel/model/export.go | 2 +- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/kernel/api/asset.go b/kernel/api/asset.go index c2827bfa8..eb0d7fe87 100644 --- a/kernel/api/asset.go +++ b/kernel/api/asset.go @@ -394,8 +394,13 @@ func uploadCloud(c *gin.Context) { return } + ignorePushMsg := false + if nil != arg["ignorePushMsg"] { + ignorePushMsg = arg["ignorePushMsg"].(bool) + } + id := arg["id"].(string) - count, err := model.UploadAssets2Cloud(id) + count, err := model.UploadAssets2Cloud(id, ignorePushMsg) if err != nil { ret.Code = -1 ret.Msg = err.Error() @@ -427,7 +432,12 @@ func uploadCloudByAssetsPaths(c *gin.Context) { assets = append(assets, pathArg.(string)) } - count, err := model.UploadAssets2CloudByAssetsPaths(assets) + ignorePushMsg := false + if nil != arg["ignorePushMsg"] { + ignorePushMsg = arg["ignorePushMsg"].(bool) + } + + count, err := model.UploadAssets2CloudByAssetsPaths(assets, ignorePushMsg) if err != nil { ret.Code = -1 ret.Msg = err.Error() @@ -435,11 +445,6 @@ func uploadCloudByAssetsPaths(c *gin.Context) { return } - ignorePushMsg := false - if nil != arg["ignorePushMsg"] { - ignorePushMsg = arg["ignorePushMsg"].(bool) - } - if !ignorePushMsg { util.PushMsg(fmt.Sprintf(model.Conf.Language(41), count), 3000) } diff --git a/kernel/model/assets.go b/kernel/model/assets.go index fe5d15d5a..31b2f86ce 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -490,7 +490,7 @@ func GetAssetAbsPath(relativePath string) (ret string, err error) { return "", errors.New(fmt.Sprintf(Conf.Language(12), relativePath)) } -func UploadAssets2Cloud(id string) (count int, err error) { +func UploadAssets2Cloud(id string, ignorePushMsg bool) (count int, err error) { if !IsSubscriber() { return } @@ -517,19 +517,19 @@ func UploadAssets2Cloud(id string) (count int, err error) { assets = append(assets, getQueryEmbedNodesAssetsLinkDests(n)...) } assets = gulu.Str.RemoveDuplicatedElem(assets) - count, err = uploadAssets2Cloud(assets, bizTypeUploadAssets) + count, err = uploadAssets2Cloud(assets, bizTypeUploadAssets, ignorePushMsg) if err != nil { return } return } -func UploadAssets2CloudByAssetsPaths(assetPaths []string) (count int, err error) { +func UploadAssets2CloudByAssetsPaths(assetPaths []string, ignorePushMsg bool) (count int, err error) { if !IsSubscriber() { return } - count, err = uploadAssets2Cloud(assetPaths, bizTypeUploadAssets) + count, err = uploadAssets2Cloud(assetPaths, bizTypeUploadAssets, ignorePushMsg) return } @@ -539,7 +539,7 @@ const ( ) // uploadAssets2Cloud 将资源文件上传到云端图床。 -func uploadAssets2Cloud(assetPaths []string, bizType string) (count int, err error) { +func uploadAssets2Cloud(assetPaths []string, bizType string, ignorePushMsg bool) (count int, err error) { var uploadAbsAssets []string for _, assetPath := range assetPaths { var absPath string @@ -562,7 +562,11 @@ func uploadAssets2Cloud(assetPaths []string, bizType string) (count int, err err } logging.LogInfof("uploading [%d] assets", len(uploadAbsAssets)) - msgId := util.PushMsg(fmt.Sprintf(Conf.Language(27), len(uploadAbsAssets)), 3000) + + var msgId string + if !ignorePushMsg { + msgId = util.PushMsg(fmt.Sprintf(Conf.Language(27), len(uploadAbsAssets)), 3000) + } if loadErr := LoadUploadToken(); nil != loadErr { util.PushMsg(loadErr.Error(), 5000) return @@ -638,7 +642,10 @@ func uploadAssets2Cloud(assetPaths []string, bizType string) (count int, err err logging.LogInfof("uploaded asset [%s]", relAsset) count++ } - util.PushClearMsg(msgId) + + if !ignorePushMsg { + util.PushClearMsg(msgId) + } if 0 < len(completedUploadAssets) { logging.LogInfof("uploaded [%d] assets", len(completedUploadAssets)) diff --git a/kernel/model/export.go b/kernel/model/export.go index 0ff44bb82..cfa84a126 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -236,7 +236,7 @@ func Export2Liandi(id string) (err error) { embedAssets := getQueryEmbedNodesAssetsLinkDests(tree.Root) assets = append(assets, embedAssets...) assets = gulu.Str.RemoveDuplicatedElem(assets) - _, err = uploadAssets2Cloud(assets, bizTypeExport2Liandi) + _, err = uploadAssets2Cloud(assets, bizTypeExport2Liandi, false) if err != nil { return }