From c522b530d7c6df221b3d54902af0f2fd6bc5945d Mon Sep 17 00:00:00 2001 From: xiaoyaofenfen <1254525673@qq.com> Date: Sun, 8 Oct 2023 14:12:18 +0800 Subject: [PATCH] add xcp command --- internal/command/mv.go | 4 +- internal/command/xcp.go | 178 ++++++++++++++++++++++++++++++++++++++++ main.go | 3 + 3 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 internal/command/xcp.go diff --git a/internal/command/mv.go b/internal/command/mv.go index 86a2ebe..4beaffd 100644 --- a/internal/command/mv.go +++ b/internal/command/mv.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -28,7 +28,7 @@ func CmdMv() cli.Command { return cli.Command{ Name: "mv", Usage: "移动文件/目录", - UsageText: `移动: + UsageText: ` aliyunpan mv <文件/目录1> <文件/目录2> <文件/目录3> ... <目标目录>`, Description: ` 注意: 移动多个文件和目录时, 请确保每一个文件和目录都存在, 否则移动操作会失败。支持通配符匹配移动文件,通配符当前只能匹配文件名,不能匹配文件路径。 diff --git a/internal/command/xcp.go b/internal/command/xcp.go new file mode 100644 index 0000000..0f559f5 --- /dev/null +++ b/internal/command/xcp.go @@ -0,0 +1,178 @@ +// Copyright (c) 2020 tickstep. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package command + +import ( + "fmt" + "github.com/tickstep/aliyunpan-api/aliyunpan" + "github.com/tickstep/aliyunpan/cmder/cmdtable" + "github.com/tickstep/aliyunpan/internal/config" + "github.com/urfave/cli" + "os" + "path" + "strconv" +) + +func CmdXcp() cli.Command { + return cli.Command{ + Name: "xcp", + Usage: "备份盘和资源库之间转存文件", + UsageText: ` + aliyunpan xcp <文件/目录1> <文件/目录2> <文件/目录3> ... <目标盘目录>`, + Description: ` + 注意: 拷贝多个文件和目录时, 请确保每一个文件和目录都存在, 否则拷贝操作会失败。 + + 示例: + + 当前程序工作在备份盘下,将备份盘 /1.mp4 文件转存复制到 资源库下的 /来自备份盘/video 目录下 + aliyunpan xcp /1.mp4 /来自备份盘/video + + 当前程序工作在资源库下,将资源库 /1.mp4 文件转存复制到 备份盘下的 /来自资源库/video 目录下 + aliyunpan xcp /1.mp4 /来自资源库/video + + 当前程序工作在备份盘下,将 /我的资源 目录下所有的.mp4文件 复制到 /来自备份盘/video 目录下面,使用通配符匹配 + aliyunpan xcp /我的资源/*.mp4 /来自备份盘/video +`, + Category: "阿里云盘", + Before: ReloadConfigFunc, + Action: func(c *cli.Context) error { + if c.NArg() <= 0 { + cli.ShowCommandHelp(c, c.Command.Name) + return nil + } + if config.Config.ActiveUser() == nil { + fmt.Println("未登录账号") + return nil + } + srcDriveId := parseDriveId(c) + dstDriveId := "" + driveList := config.Config.ActiveUser().DriveList + if driveList.GetFileDriveId() == srcDriveId { + dstDriveId = driveList.GetResourceDriveId() + } else if driveList.GetResourceDriveId() == srcDriveId { + dstDriveId = driveList.GetFileDriveId() + } else { + fmt.Println("不支持该操作") + return nil + } + RunXCopy(srcDriveId, dstDriveId, c.Args()...) + return nil + }, + Flags: []cli.Flag{ + cli.StringFlag{ + Name: "driveId", + Usage: "源网盘ID", + Value: "", + }, + }, + } +} + +// RunXCopy 执行复制文件/目录 +func RunXCopy(srcDriveId, dstDriveId string, paths ...string) { + activeUser := GetActiveUser() + cacheCleanPaths := []string{} + opFileList, targetFile, _, err := getCrossCopyFileInfo(srcDriveId, dstDriveId, paths...) + if err != nil { + fmt.Println(err) + return + } + if targetFile == nil { + fmt.Println("目标目录不存在") + return + } + if opFileList == nil || len(opFileList) == 0 { + fmt.Println("没有有效的文件可复制") + return + } + cacheCleanPaths = append(cacheCleanPaths, targetFile.Path) + + failedCopyFiles := []*aliyunpan.FileEntity{} + copyFileParamList := []string{} + fileId2FileEntity := map[string]*aliyunpan.FileEntity{} + for _, mfi := range opFileList { + fileId2FileEntity[mfi.FileId] = mfi + copyFileParamList = append(copyFileParamList, mfi.FileId) + cacheCleanPaths = append(cacheCleanPaths, path.Dir(mfi.Path)) + } + fccr, er := activeUser.PanClient().FileCrossDriveCopy(&aliyunpan.FileCrossCopyParam{ + FromDriveId: srcDriveId, + FromFileIds: copyFileParamList, + ToDriveId: dstDriveId, + ToParentFileId: targetFile.FileId, + }) + for _, rs := range fccr { + if rs.Status != 201 { + failedCopyFiles = append(failedCopyFiles, fileId2FileEntity[rs.SourceFileId]) + } + } + + if len(failedCopyFiles) > 0 { + fmt.Println("以下文件复制失败:") + for _, f := range failedCopyFiles { + fmt.Println(f.FileName) + } + fmt.Println("") + } + if er == nil { + pnt := func() { + tb := cmdtable.NewTable(os.Stdout) + tb.SetHeader([]string{"#", "文件/目录"}) + for k, rs := range fccr { + tb.Append([]string{strconv.Itoa(k + 1), fileId2FileEntity[rs.SourceFileId].Path}) + } + tb.Render() + } + fmt.Println("操作成功, 以下文件已复制到目标目录: ", targetFile.Path) + pnt() + activeUser.DeleteCache(cacheCleanPaths) + } else { + fmt.Println("无法复制文件,请稍后重试") + } +} + +func getCrossCopyFileInfo(srcDriveId, dstDriveId string, paths ...string) (opFileList []*aliyunpan.FileEntity, targetFile *aliyunpan.FileEntity, failedPaths []string, error error) { + if len(paths) <= 1 { + return nil, nil, nil, fmt.Errorf("请指定目标文件夹路径") + } + activeUser := GetActiveUser() + + // the last one is the target file path + targetFilePath := path.Clean(paths[len(paths)-1]) + absolutePath := activeUser.PathJoin(dstDriveId, targetFilePath) + targetFile, err := activeUser.PanClient().FileInfoByPath(dstDriveId, absolutePath) + if err != nil || !targetFile.IsFolder() { + return nil, nil, nil, fmt.Errorf("指定目标文件夹不存在") + } + + // source file list + for idx := 0; idx < (len(paths) - 1); idx++ { + absolutePath = path.Clean(activeUser.PathJoin(srcDriveId, paths[idx])) + fileList, err1 := matchPathByShellPattern(srcDriveId, absolutePath) + if err1 != nil { + failedPaths = append(failedPaths, absolutePath) + continue + } + if fileList == nil || len(fileList) == 0 { + // 文件不存在 + failedPaths = append(failedPaths, absolutePath) + continue + } + for _, f := range fileList { + // 移动匹配的文件 + opFileList = append(opFileList, f) + } + } + return +} diff --git a/main.go b/main.go index edd2fd4..ba5ee92 100644 --- a/main.go +++ b/main.go @@ -438,6 +438,9 @@ func main() { //// 拷贝文件/目录 cp //command.CmdCp(), + // 备份盘和资源库之间拷贝文件 xcp + command.CmdXcp(), + // 移动文件/目录 mv command.CmdMv(),