优化上传文件匹配逻辑，支持目录模式匹配

Author: gowsp

pkg/drive/upload.go

@@ -35,7 +35,7 @@ func (client *FS) Upload(cfg pkg.UploadConfig, cloud string, locals ...string) e
 			// up = append(up, u)
 			continue
 		}
-		files, err := client.uploadLocal(dir, local)
+		files, err := client.uploadLocal(dir, local, cfg.Parten)
 		if err != nil {
 			log.Println(err)
 			continue
@@ -45,9 +45,6 @@ func (client *FS) Upload(cfg pkg.UploadConfig, cloud string, locals ...string) e
 	task := cfg.NewTask()
 	uploader := client.api.Uploader()
 	for _, v := range up {
-		if !cfg.Match(v.Name()) {
-			continue
-		}
 		r := v
 		task.Run(func() {
 			if err = uploader.Write(r); err != nil {
@@ -59,7 +56,7 @@ func (client *FS) Upload(cfg pkg.UploadConfig, cloud string, locals ...string) e
 	return nil
 }
 
-func (client *FS) uploadLocal(parent pkg.File, local string) ([]pkg.Upload, error) {
+func (client *FS) uploadLocal(parent pkg.File, local string, parten string) ([]pkg.Upload, error) {
 	stat, err := os.Stat(local)
 	if err != nil {
 		return nil, err
@@ -72,23 +69,40 @@ func (client *FS) uploadLocal(parent pkg.File, local string) ([]pkg.Upload, erro
 	dirs := map[string]string{
 		".": parent.Id(),
 	}
-	filepath.WalkDir(local, func(path string, d fs.DirEntry, err error) error {
+	parten = filepath.Join(local, parten)
+	files, err := filepath.Glob(parten)
+	if err != nil {
+		return nil, err
+	}
+	for _, localFile := range files {
+		info, err := os.Stat(localFile)
 		if err != nil {
-			return err
+			log.Println(err)
+			continue
 		}
-		if d.IsDir() {
-			rel := file.Rel(local, path)
-			if rel == "." {
-				return nil
-			}
-			f, _ := client.api.Mkdir(parent, rel)
-			dirs[rel] = f.Id()
-			return nil
+		if info.IsDir() {
+			filepath.WalkDir(localFile, func(path string, d fs.DirEntry, err error) error {
+				if err != nil {
+					return err
+				}
+				if d.IsDir() {
+					rel := file.Rel(local, path)
+					if rel == "." {
+						return nil
+					}
+					f, _ := client.api.Mkdir(parent, rel)
+					dirs[rel] = f.Id()
+					return nil
+				}
+				dir, _ := filepath.Split(path)
+				rel := file.Rel(local, dir)
+				up = append(up, file.NewLocalFile(dirs[rel], path))
+				return err
+			})
+		} else {
+			up = append(up, file.NewLocalFile(parent.Id(), localFile))
 		}
-		dir, _ := filepath.Split(path)
-		rel := file.Rel(local, dir)
-		up = append(up, file.NewLocalFile(dirs[rel], path))
-		return err
-	})
+
+	}
 	return up, nil
 }

pkg/upload.go

@@ -3,8 +3,6 @@ package pkg
 import (
 	"errors"
 	"io"
-	"log"
-	"path"
 	"strings"
 
 	"github.com/gowsp/cloud189/pkg/util"
@@ -52,14 +50,3 @@ func (c *UploadConfig) Check() (err error) {
 	c.Parten = strings.TrimSpace(c.Parten)
 	return nil
 }
-func (c *UploadConfig) Match(name string) bool {
-	if c.Parten == "" {
-		return true
-	}
-	val, err := path.Match(c.Parten, name)
-	if err != nil {
-		log.Println(err)
-		return false
-	}
-	return val
-}