🐛 Only validate the name when the S3 bucket name changes https://ld246.com/article/1775665943744 (#17433)

Author: TCOTC

kernel/api/sync.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/siyuan-note/dejavu/cloud"
 	"github.com/siyuan-note/logging"
 
 	"github.com/88250/gulu"
@@ -690,6 +691,15 @@ func setSyncProviderS3(c *gin.Context) {
 		return
 	}
 
+	newBucket := strings.TrimSpace(s3.Bucket)
+	prevBucket := strings.TrimSpace(model.Conf.Sync.S3.Bucket)
+	if newBucket != prevBucket && !cloud.IsValidCloudDirName(newBucket) {
+		ret.Code = -1
+		ret.Msg = model.Conf.Language(37)
+		ret.Data = map[string]any{"closeTimeout": 5000}
+		return
+	}
+
 	err = model.SetSyncProviderS3(s3)
 	if err != nil {
 		ret.Code = -1

kernel/model/sync.go

@@ -441,11 +441,6 @@ func SetSyncProviderS3(s3 *conf.S3) (err error) {
 	s3.Timeout = util.NormalizeTimeout(s3.Timeout)
 	s3.ConcurrentReqs = util.NormalizeConcurrentReqs(s3.ConcurrentReqs, conf.ProviderS3)
 
-	if !cloud.IsValidCloudDirName(s3.Bucket) {
-		util.PushErrMsg(Conf.Language(37), 5000)
-		return
-	}
-
 	Conf.Sync.S3 = s3
 	Conf.Save()
 	return