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

✨ 分享文档到链滴 https://github.com/siyuan-note/siyuan/issues/2004

Browse source
This commit is contained in:
Liang Ding 2023-01-04 14:07:19 +08:00
parent 3fced58e30
commit 58a29ec570
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/model/assets.go
View file

@ -292,6 +292,8 @@ const (
// uploadAssets2Cloud 将资源文件上传到云端图床。 // uploadAssets2Cloud 将资源文件上传到云端图床。
func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) { func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) {
var uploadAbsAssets []string
if bizTypeUploadAssets == bizType { // 只有上传资源文件到图床时才需要判断是否已经上传过
syncedAssets := readWorkspaceAssets() syncedAssets := readWorkspaceAssets()
var unSyncAssets []string var unSyncAssets []string
for _, sqlAsset := range sqlAssets { for _, sqlAsset := range sqlAssets {
@ -304,7 +306,6 @@ func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) {
return return
} }
var uploadAbsAssets []string
for _, asset := range unSyncAssets { for _, asset := range unSyncAssets {
var absPath string var absPath string
absPath, err = GetAssetAbsPath(asset) absPath, err = GetAssetAbsPath(asset)
@ -324,6 +325,7 @@ func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) {
if 1 > len(uploadAbsAssets) { if 1 > len(uploadAbsAssets) {
return return
} }
}
uploadAbsAssets = gulu.Str.RemoveDuplicatedElem(uploadAbsAssets) uploadAbsAssets = gulu.Str.RemoveDuplicatedElem(uploadAbsAssets)
@ -399,8 +401,8 @@ func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) {
} }
util.PushClearMsg(msgId) util.PushClearMsg(msgId)
if 0 < len(completedUploadAssets) { if bizTypeUploadAssets == bizType && 0 < len(completedUploadAssets) {
syncedAssets = readWorkspaceAssets() syncedAssets := readWorkspaceAssets()
logging.LogInfof("uploaded [%d] assets", len(completedUploadAssets)) logging.LogInfof("uploaded [%d] assets", len(completedUploadAssets))
for _, completedSyncAsset := range completedUploadAssets { for _, completedSyncAsset := range completedUploadAssets {
syncedAssets = append(syncedAssets, completedSyncAsset) syncedAssets = append(syncedAssets, completedSyncAsset)