refactor(client): change output flag behavior for multiple file and s…

…ingle file
mplus-oss · Aug 16, 2024 · 1bafc1f · 1bafc1f
1 parent cb8f3b7
commit 1bafc1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/cmd/mdrop-client/get_command.go b/cmd/mdrop-client/get_command.go
@@ -17,7 +17,7 @@ func GetCommand(args []string) {
 	flag := flag.NewFlagSet("mdrop get", flag.ExitOnError)
 	var (
 		help		= flag.Bool("help", false, "Print this message")
-		fileNameOpt = flag.String("output", "", "Set filename output")
+		fileNameOpt = flag.String("output", "", "Set file or directory output")
 		localPort	= flag.Int("local-port", 6000, "Specified sender port remoted on local")
 	)
 	flag.Parse(args)
@@ -71,11 +71,12 @@ func GetCommand(args []string) {
 	GetTcpReadyConnect(*localPort)
 
 	// Downloading file
+	isSingleFile := len(sender.Files) < 2
 	for _, uuid := range sender.Files {
 		// No error checking needed.
-		fileName := GetPrompt(*localPort, uuid, *fileNameOpt)
+		fileName := GetPrompt(*localPort, uuid, *fileNameOpt, isSingleFile)
 		checksum := GetChecksum(*localPort, uuid)
-		filePath := GetDownload(*localPort, uuid, fileName)
+		filePath := GetDownload(*localPort, uuid, fileName, *fileNameOpt, isSingleFile)
 
 		// Check checksum
 		fmt.Println("Checking checksum...")

diff --git a/cmd/mdrop-client/get_download.go b/cmd/mdrop-client/get_download.go
@@ -33,7 +33,7 @@ func GetChecksum(localPort int, uuid string) string {
 	return string(checksumBytes)
 }
 
-func GetPrompt(localPort int, uuid string, fileNameOpt string) (filePath string) {
+func GetPrompt(localPort int, uuid string, fileNameOpt string, isSingleFile bool) (filePath string) {
 	reader := bufio.NewReader(os.Stdin)
 	client := http.Client{}
 
@@ -72,9 +72,12 @@ func GetPrompt(localPort int, uuid string, fileNameOpt string) (filePath string)
 	if err != nil {
 		internal.PrintErrorWithExit("sendFileWorkDir", err, 1)
 	}
-	if fileNameOpt != "" {
-		fmt.Println("Changing filename to", fileNameOpt)
-		fileName = fileNameOpt
+	// Check if it's single file
+	if isSingleFile {
+		if fileNameOpt != "" {
+			fmt.Println("Changing filename to", fileNameOpt)
+			fileName = fileNameOpt
+		}
 	}
 	if fileStatus, _ := os.Stat(filePath+"/"+fileName); fileStatus != nil {
 		fmt.Print("There's duplicate file. Action? [(R)eplace/R(e)name/(C)ancel] [Default: R] -> ")
@@ -103,7 +106,7 @@ func GetPrompt(localPort int, uuid string, fileNameOpt string) (filePath string)
 	return fileName
 }
 
-func GetDownload(localPort int, uuid string, fileName string) string {
+func GetDownload(localPort int, uuid string, fileName string, fileNameOpt string, isSingleFile bool) string {
 	client := http.Client{}
 
 	resp, err := client.Post(
@@ -126,6 +129,10 @@ func GetDownload(localPort int, uuid string, fileName string) string {
 	if err != nil {
 		internal.PrintErrorWithExit("sendFileWorkDir", err, 1)
 	}
+	if !isSingleFile {
+		filePath = fileNameOpt
+		fmt.Println("Changing working directory to", filePath)
+	}
 	filePath += "/"+fileName
 
 	// Create file