Clone/aliyunpan
1
0
Fork 0
mirror of https://github.com/tickstep/aliyunpan.git synced 2025-02-02 21:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rm command support wildcard pattern

Browse Source
This commit is contained in:
xiaoyaofenfen 2022-12-05 20:10:02 +08:00
parent 0d203ece9a
commit fb24f703c2
1 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
internal/command/rm.go
View File

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