Fix reaPath

Author: zhangliang

Diff for: lib/qiniu/upload.go

@@ -3,11 +3,10 @@ package qiniu
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
-	"strings"
-
-	"io"
+	"time"
 
 	"github.com/qiniu/go-sdk/v7/auth/qbox"
 	"github.com/qiniu/go-sdk/v7/storage"
@@ -25,7 +24,7 @@ type PutRsp struct {
 	Bucket string
 }
 
-// 上传一个文件夹
+// UploadDir 上传一个文件夹
 func (u Uploader) UploadDir(zone *storage.Zone, bucket string, keyPrefix string, dirPath string) (err error) {
 	fmt.Printf("upload dir: '%s' to bucket '%s', prefix: '%s'\n", dirPath, bucket, keyPrefix)
 
@@ -37,16 +36,19 @@ func (u Uploader) UploadDir(zone *storage.Zone, bucket string, keyPrefix string,
 			return nil
 		}
 
-		// 相对路径
-		reaPath := strings.Replace(path, dirPath, "", -1)
-		reaPath = strings.Trim(reaPath, string(os.PathSeparator))
-
-		// for windows
-		// 将分隔符替换为/
-		reaPath = strings.Replace(reaPath, string(os.PathSeparator), "/", -1)
+		reaPath, err := filepath.Rel(dirPath, path)
+		if err != nil {
+			return err
+		}
 
+		start := time.Now()
 		_, err = u.UploadFile(zone, bucket, keyPrefix+reaPath, path)
-		return err
+		if err != nil {
+			return fmt.Errorf("upload file '%s' error: %w", keyPrefix+reaPath, err)
+		}
+		fmt.Printf("uploaded file '%s' success, spend time: %v\n", keyPrefix+reaPath, time.Since(start))
+
+		return nil
 	})
 	if err != nil {
 		return

Diff for: lib/qiniu/upload_test.go

@@ -6,8 +6,8 @@ import (
 )
 
 func TestUploadDir(t *testing.T) {
-	u := NewQiniu("I50Yj4ceahNUfdGxS-7p5KrnWiZF18APP32t59jV", "bIdalJ61Q_S32R5CLzZw3-4DCL2YBQpvOqk-BRjW").Uploader()
-	err := u.UploadDir(&storage.ZoneHuadong, "nameimtest", "drone/", `E:\tmp\cdn-file\baidu\share\api`)
+	u := NewQiniu("", "").Uploader()
+	err := u.UploadDir(&storage.ZoneHuadong, "nameimtest", "test2/", `../qiniu/`)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -16,7 +16,7 @@ func TestUploadDir(t *testing.T) {
 }
 
 func TestUploadFile(t *testing.T) {
-	u := NewQiniu("I50Yj4ceahNUfdGxS-7p5KrnWiZF18APP32t59jV", "bIdalJ61Q_S32R5CLzZw3-4DCL2YBQpvOqk-BRjW").Uploader()
+	u := NewQiniu("", "").Uploader()
 	_, err := u.UploadFile(&storage.ZoneHuadong, "nameimtest", "drone/", `Z:\go_path\src\github.com\bysir-zl\drone-qiniu\Dockerfile`)
 	if err != nil {
 		t.Fatal(err)