fix: fix confict

cmd/cmd_object.go

@@ -481,19 +481,32 @@ func uploadFile(bucketName, objectName, filePath, urlInfo string, ctx *cli.Conte
 	}
 	defer reader.Close()
 
-	progressReader := &ProgressReader{
-		Reader: reader,
-		Total:  objectSize,
-	}
-
 	// if the file is more than 2G , it needs to force use resume uploading
 	if objectSize > maxPutWithoutResumeSize {
 		opt.DisableResumable = false
 	}
 
-	if err = gnfdClient.PutObject(c, bucketName, objectName,
-		objectSize, progressReader, opt); err != nil {
-		return toCmdErr(err)
+	if opt.DisableResumable {
+		progressReader := &ProgressReader{
+			Reader:      reader,
+			Total:       objectSize,
+			StartTime:   time.Now(),
+			LastPrinted: time.Now(),
+		}
+
+		if objectSize > objectLargerSize {
+			progressReader.LastPrinted = time.Now().Add(2 * time.Second)
+		}
+
+		if err = gnfdClient.PutObject(c, bucketName, objectName,
+			objectSize, progressReader, opt); err != nil {
+			return toCmdErr(err)
+		}
+	} else {
+		if err = gnfdClient.PutObject(c, bucketName, objectName,
+			objectSize, reader, opt); err != nil {
+			return toCmdErr(err)
+		}
 	}
 
 	if bypassSeal {

cmd/utils.go

@@ -565,10 +565,8 @@ func (pr *ProgressReader) printProgress() {
 	if now.Sub(pr.LastPrinted) >= time.Second { // print rate every second
 		progressStr := fmt.Sprintf("uploading progress: %.2f%% [ %s / %s ], rate: %s",
 			progress, getConvertSize(pr.Current), getConvertSize(pr.Total), getConvertRate(uploadSpeed))
-
 		// Clear current line
 		fmt.Print("\r", strings.Repeat(" ", len(pr.LastPrintedStr)), "\r")
-
 		// Print new progress
 		fmt.Print(progressStr)