rm command support wildcard pattern

internal/command/rm.go

@@ -19,7 +19,6 @@ import (
 	"github.com/tickstep/aliyunpan/cmder"
 	"github.com/tickstep/aliyunpan/cmder/cmdtable"
 	"github.com/tickstep/aliyunpan/internal/config"
-	"github.com/tickstep/library-go/logger"
 	"github.com/urfave/cli"
 	"os"
 	"path"
@@ -84,32 +83,18 @@ func RunRemove(driveId string, paths ...string) {
 
 	for _, p := range paths {
 		absolutePath := path.Clean(activeUser.PathJoin(driveId, p))
-		name := path.Base(absolutePath)
-
-		fe, err := activeUser.PanClient().FileInfoByPath(driveId, absolutePath)
-		if err != nil {
-			// 匹配的文件不存在，是否是通配符匹配的文件
-			if isMatchWildcardPattern(name) {
-				// 通配符
-				parentDir := path.Dir(absolutePath)
-				wildcardName := path.Base(absolutePath)
-				pf, err1 := activeUser.PanClient().FileInfoByPath(driveId, parentDir)
+		fileList, err1 := matchPathByShellPattern(driveId, absolutePath)
 		if err1 != nil {
 			failedRmPaths = append(failedRmPaths, absolutePath)
 			continue
 		}
-				fileList, er := activeUser.PanClient().FileListGetAll(&aliyunpan.FileListParam{
-					DriveId:      driveId,
-					ParentFileId: pf.FileId,
-				}, 500)
-				if er != nil {
+		if fileList == nil || len(fileList) == 0 {
+			// 失败，文件不存在
 			failedRmPaths = append(failedRmPaths, absolutePath)
 			continue
 		}
 		for _, f := range fileList {
-					if isIncludeFile(wildcardName, f.FileName) {
-						f.Path = parentDir + "/" + f.FileName
-						logger.Verboseln("wildcard match delete: " + f.Path)
+			// 删除匹配的文件
 			delFileInfos = append(delFileInfos, &aliyunpan.FileBatchActionParam{
 				DriveId: driveId,
 				FileId:  f.FileId,
@@ -118,22 +103,6 @@ func RunRemove(driveId string, paths ...string) {
 			cacheCleanDirs = append(cacheCleanDirs, path.Dir(f.Path))
 		}
 	}
-			} else {
-				// 失败，文件不存在
-				failedRmPaths = append(failedRmPaths, absolutePath)
-				continue
-			}
-		} else {
-			// 直接删除匹配的文件
-			fe.Path = absolutePath
-			delFileInfos = append(delFileInfos, &aliyunpan.FileBatchActionParam{
-				DriveId: driveId,
-				FileId:  fe.FileId,
-			})
-			fileId2FileEntity[fe.FileId] = fe
-			cacheCleanDirs = append(cacheCleanDirs, path.Dir(fe.Path))
-		}
-	}
 
 	// delete
 	successDelFileEntity := []*aliyunpan.FileEntity{}