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

✨ 分享文档到链滴 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

56
kernel/model/assets.go
View file

@ -292,37 +292,39 @@ const (
// uploadAssets2Cloud 将资源文件上传到云端图床。 // uploadAssets2Cloud 将资源文件上传到云端图床。
func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) { func uploadAssets2Cloud(sqlAssets []*sql.Asset, bizType string) (err error) {
syncedAssets := readWorkspaceAssets()
var unSyncAssets []string
for _, sqlAsset := range sqlAssets {
if !gulu.Str.Contains(sqlAsset.Path, syncedAssets) && strings.Contains(sqlAsset.Path, "assets/") {
unSyncAssets = append(unSyncAssets, sqlAsset.Path)
}
}
if 1 > len(unSyncAssets) {
return
}
var uploadAbsAssets []string var uploadAbsAssets []string
for _, asset := range unSyncAssets { if bizTypeUploadAssets == bizType { // 只有上传资源文件到图床时才需要判断是否已经上传过
var absPath string syncedAssets := readWorkspaceAssets()
absPath, err = GetAssetAbsPath(asset) var unSyncAssets []string
if nil != err { for _, sqlAsset := range sqlAssets {
logging.LogWarnf("get asset [%s] abs path failed: %s", asset, err) if !gulu.Str.Contains(sqlAsset.Path, syncedAssets) && strings.Contains(sqlAsset.Path, "assets/") {
return unSyncAssets = append(unSyncAssets, sqlAsset.Path)
}
} }
if "" == absPath {
logging.LogErrorf("not found asset [%s]", asset) if 1 > len(unSyncAssets) {
err = errors.New(fmt.Sprintf(Conf.Language(12), asset))
return return
} }
uploadAbsAssets = append(uploadAbsAssets, absPath) for _, asset := range unSyncAssets {
} var absPath string
absPath, err = GetAssetAbsPath(asset)
if nil != err {
logging.LogWarnf("get asset [%s] abs path failed: %s", asset, err)
return
}
if "" == absPath {
logging.LogErrorf("not found asset [%s]", asset)
err = errors.New(fmt.Sprintf(Conf.Language(12), asset))
return
}
if 1 > len(uploadAbsAssets) { uploadAbsAssets = append(uploadAbsAssets, absPath)
return }
if 1 > len(uploadAbsAssets) {
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)