support parent id in download and new commands.

cmd/download/download.go

@@ -38,6 +38,9 @@ var count int
 // default server root directory (.)
 var folder string
 
+// parent path id
+var parentId string
+
 // Output directory
 //
 // default current directory (.)
@@ -57,15 +60,20 @@ func init() {
 	DownloadCmd.Flags().IntVarP(&count, "count", "c", 3, "number of simultaneous downloads")
 	DownloadCmd.Flags().StringVarP(&output, "output", "o", "", "output directory")
 	DownloadCmd.Flags().StringVarP(&folder, "path", "p", "/", "specific the folder of the pikpak server\nonly support download folder")
+	DownloadCmd.Flags().StringVarP(&parentId, "parent-id", "P", "", "the parent path id")
 }
 
 // Downloads all files in the specified directory
 func downloadFolder(p *pikpak.PikPak) {
 	base := filepath.Base(folder)
-	parentId, err := p.GetPathFolderId(folder)
-	if err != nil {
-		logrus.Errorln("Get Parent Folder Id Failed:", err)
-		return
+	var err error
+	if parentId == "" {
+		parentId, err = p.GetPathFolderId(folder)
+		if err != nil {
+			logrus.Errorln("Get Parent Folder Id Failed:", err)
+			return
+		}
+
 	}
 	collectStat := make([]warpStat, 0)
 	recursive(p, &collectStat, parentId, filepath.Join(output, base))
@@ -141,31 +149,37 @@ func recursive(p *pikpak.PikPak, collectWarpFile *[]warpStat, parentId string, p
 }
 
 func downloadFile(p *pikpak.PikPak, args []string) {
-	files := make([]string, 0, len(args))
-	for _, v := range args {
-		files = append(files, filepath.Join(folder, v))
+	var err error
+	if parentId == "" {
+		parentId, err = p.GetPathFolderId(folder)
+		if err != nil {
+			logrus.Errorln("get folder failed:", err)
+			return
+		}
+	}
+
+	// if output not exists then create.
+	if err := utils.CreateDirIfNotExist(output); err != nil {
+		logrus.Errorln("Create output directory failed:", err)
+		return
 	}
 
 	sendCh := make(chan warpFile, 1)
-	receiveCh := make(chan struct{}, len(files))
+	receiveCh := make(chan struct{}, len(args))
+
 	for i := 0; i < count; i++ {
 		go download(sendCh, receiveCh)
 	}
-	for _, f := range files {
-		dir, base := filepath.Dir(f), filepath.Base(f)
-		id, err := p.GetPathFolderId(dir)
+	for _, path := range args {
+		stat, err := p.GetFileStat(parentId, path)
 		if err != nil {
-			logrus.Errorln(dir, "Get Parent Folder Id Failed:", err)
-			continue
-		}
-		stat, err := p.GetFileStat(id, base)
-		if err != nil {
-			logrus.Errorln(base, "Get File Stat Failed:", err)
+			logrus.Errorln(path, "get parent id failed:", err)
 			continue
 		}
+
 		file, err := p.GetFile(stat.ID)
 		if err != nil {
-			logrus.Errorln(base, "Get File Failed:", err)
+			logrus.Errorln(path, "get file failed", err)
 			continue
 		}
 		sendCh <- warpFile{
@@ -174,7 +188,7 @@ func downloadFile(p *pikpak.PikPak, args []string) {
 		}
 	}
 	close(sendCh)
-	for i := 0; i < len(files); i++ {
+	for i := 0; i < len(args); i++ {
 		<-receiveCh
 	}
 	close(receiveCh)

cmd/new/folder/folder.go

@@ -25,17 +25,22 @@ var NewFolderCommand = &cobra.Command{
 }
 
 var path string
+var parentId string
 
 func init() {
 	NewFolderCommand.Flags().StringVarP(&path, "path", "p", "/", "The path of the folder")
+	NewFolderCommand.Flags().StringVarP(&parentId, "parent-id", "P", "", "The parent id")
 }
 
 // new folder
 func handleNewFolder(p *pikpak.PikPak, folders []string) {
-	parentId, err := p.GetPathFolderId(path)
-	if err != nil {
-		logrus.Errorf("Get parent id failed: %s\n", err)
-		return
+	var err error
+	if parentId == "" {
+		parentId, err = p.GetPathFolderId(path)
+		if err != nil {
+			logrus.Errorf("Get parent id failed: %s\n", err)
+			return
+		}
 	}
 
 	for _, folder := range folders {

cmd/new/sha/sha.go

@@ -52,19 +52,25 @@ var NewShaCommand = &cobra.Command{
 
 var path string
 
+var parentId string
+
 var input string
 
 func init() {
 	NewShaCommand.Flags().StringVarP(&path, "path", "p", "/", "The path of the folder")
 	NewShaCommand.Flags().StringVarP(&input, "input", "i", "", "The input of the sha file")
+	NewShaCommand.Flags().StringVarP(&parentId, "parent-id", "P", "", "The parent id")
 }
 
 // new folder
 func handleNewSha(p *pikpak.PikPak, shas []string) {
-	parentId, err := p.GetPathFolderId(path)
-	if err != nil {
-		logrus.Errorf("Get parent id failed: %s\n", err)
-		return
+	var err error
+	if parentId == "" {
+		parentId, err = p.GetPathFolderId(path)
+		if err != nil {
+			logrus.Errorf("Get parent id failed: %s\n", err)
+			return
+		}
 	}
 
 	for _, sha := range shas {

cmd/new/url/url.go

@@ -57,24 +57,29 @@ var NewUrlCommand = &cobra.Command{
 
 var path string
 
+var parentId string
+
 var input string
 
 var cli bool
 
 func init() {
 	NewUrlCommand.Flags().StringVarP(&path, "path", "p", "/", "The path of the folder")
+	NewUrlCommand.Flags().StringVarP(&parentId, "parent-id", "P", "", "The parent id")
 	NewUrlCommand.Flags().StringVarP(&input, "input", "i", "", "The input of the sha file")
 	NewUrlCommand.Flags().BoolVarP(&cli, "cli", "c", false, "The cli mode")
 }
 
 // new folder
 func handleNewUrl(p *pikpak.PikPak, shas []string) {
-	parentId, err := p.GetPathFolderId(path)
-	if err != nil {
-		logrus.Errorf("Get parent id failed: %s\n", err)
-		return
+	var err error
+	if parentId == "" {
+		parentId, err = p.GetPathFolderId(path)
+		if err != nil {
+			logrus.Errorf("Get parent id failed: %s\n", err)
+			return
+		}
 	}
-
 	for _, url := range shas {
 		err := p.CreateUrlFile(parentId, url)
 		if err != nil {
@@ -86,10 +91,13 @@ func handleNewUrl(p *pikpak.PikPak, shas []string) {
 }
 
 func handleCli(p *pikpak.PikPak) {
-	parentId, err := p.GetPathFolderId(path)
-	if err != nil {
-		logrus.Errorf("Get parent id failed: %s\n", err)
-		return
+	var err error
+	if parentId == "" {
+		parentId, err = p.GetPathFolderId(path)
+		if err != nil {
+			logrus.Errorf("Get parent id failed: %s\n", err)
+			return
+		}
 	}
 
 	reader := bufio.NewReader(os.Stdin)