added creation of dst folder for copySrc

README.md

@@ -643,7 +643,7 @@ Copy a file from one node to another node.
         "fileName": "copy.log",
         "toNodes": ["central"],
         "method":"REQCopySrc",
-        "methodArgs": ["./testbinary","ship1","./testbinary-copied","500000","20"],
+        "methodArgs": ["./testbinary","ship1","./testbinary-copied","500000","20","0700"],
         "methodTimeout": 10,
         "replyMethod":"REQToConsole"
     }
@@ -657,6 +657,7 @@ Copy a file from one node to another node.
   - 3. DstFullPath, the full path including the name of the destination file. The filename can be different than the original name.
   - 4. SplitChunkSize, the size of the chunks to split the file into for transfer.
   - 5. MaxTotalCopyTime, specifies the maximum allowed time the complete copy should take. Make sure you set this long enough to allow the transfer to complete.
+  - 6. FolderPermission, the permissions to set on the destination folder if it does not exist and needs to be created. Will default to 0755 if no value is set.
 
 To copy from a remote node to the local node, you specify the remote nodeName in the toNode field, and the message will be forwarded to the remote node. The copying request will then be picked up by the remote node's **REQCopySrc** handler, and the copy session will then be handled from the remote node.
 

requests_copy.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"log"
 	"os"
 	"path/filepath"
 	"sort"
@@ -29,6 +30,7 @@ type copyInitialData struct {
 	SplitChunkSize   int
 	MaxTotalCopyTime int
 	FileMode         fs.FileMode
+	FolderPermission uint64
 }
 
 type methodREQCopySrc struct {
@@ -116,15 +118,21 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 		// Set default max total copy time, will be replaced with value from
 		// methodArgs[4] if defined.
 		maxTotalCopyTime := message.MethodTimeout
+		// Default permission of destination folder if we need to create it.
+		// The value will be replaced
+		folderPermission := uint64(0755)
 
+		er := fmt.Errorf("info: before switch: FolderPermission defined in message for socket: %04o", folderPermission)
+		proc.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
 		// Verify and check the methodArgs
-		switch {
-		case len(message.MethodArgs) < 3:
+
+		if len(message.MethodArgs) < 3 {
 			er := fmt.Errorf("error: methodREQCopySrc: got <3 number methodArgs: want srcfilePath,dstNode,dstFilePath")
 			proc.errorKernel.errSend(proc, message, er)
 			return
+		}
 
-		case len(message.MethodArgs) > 3:
+		if len(message.MethodArgs) > 3 {
 			// Check if split chunk size was set, if not keep default.
 			var err error
 			splitChunkSize, err = strconv.Atoi(message.MethodArgs[3])
@@ -132,9 +140,9 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 				er := fmt.Errorf("error: methodREQCopySrc: unble to convert splitChunkSize into int value: %v", err)
 				proc.errorKernel.errSend(proc, message, er)
 			}
-			fallthrough
+		}
 
-		case len(message.MethodArgs) > 4:
+		if len(message.MethodArgs) > 4 {
 			// Check if maxTotalCopyTime was set, if not keep default.
 			var err error
 			maxTotalCopyTime, err = strconv.Atoi(message.MethodArgs[4])
@@ -144,6 +152,23 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 			}
 		}
 
+		if len(message.MethodArgs) > 5 && message.MethodArgs[5] != "" {
+			fmt.Printf("\n\n\n Lenght was more than 5 for arguments\n\n")
+			// Check if file permissions were set, if not use default.
+			var err error
+			folderPermission, err = strconv.ParseUint(message.MethodArgs[5], 8, 32)
+			if err != nil {
+				log.Printf("%v\n", err)
+			}
+
+			er := fmt.Errorf("info: FolderPermission defined in message for socket: %v, converted = %v", message.MethodArgs[5], folderPermission)
+			proc.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
+			if err != nil {
+				er := fmt.Errorf("error: methodREQCopySrc: unable to convert folderPermission into int value: %v", err)
+				proc.errorKernel.errSend(proc, message, er)
+			}
+		}
+
 		SrcFilePath := message.MethodArgs[0]
 		DstNode := message.MethodArgs[1]
 		DstFilePath := message.MethodArgs[2]
@@ -193,6 +218,7 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 			SplitChunkSize:   splitChunkSize,
 			MaxTotalCopyTime: maxTotalCopyTime,
 			FileMode:         fileMode,
+			FolderPermission: folderPermission,
 		}
 
 		sub := newSubjectNoVerifyHandler(m, node)
@@ -214,7 +240,7 @@ func (m methodREQCopySrc) handler(proc process, message Message, node string) ([
 		// Send a message over the the node where the destination file will be written,
 		// to also start up a sub process on the destination node.
 
-		// Marshal the data payload to send the the dst.
+		// Marshal the data payload to send to the dst.
 		cb, err := cbor.Marshal(cia)
 		if err != nil {
 			er := fmt.Errorf("error: newSubjectAndMessage : %v, message: %v", err, message)
@@ -597,7 +623,12 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
 
 		// Open a tmp folder for where to write the received chunks
 		tmpFolder := filepath.Join(proc.configuration.SocketFolder, cia.DstFile+"-"+cia.UUID)
-		os.Mkdir(tmpFolder, 0700)
+		err = os.Mkdir(tmpFolder, 0700)
+		if err != nil {
+			er := fmt.Errorf("copyDstProcSubFunc: create tmp folder for copying failed: %v", err)
+			proc.errorKernel.errSend(proc, message, er)
+			return er
+		}
 
 		for {
 			select {
@@ -630,14 +661,14 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
 						filePath := filepath.Join(tmpFolder, strconv.Itoa(csa.ChunkNumber)+"."+cia.UUID)
 						fh, err := os.OpenFile(filePath, os.O_TRUNC|os.O_RDWR|os.O_CREATE|os.O_SYNC, 0600)
 						if err != nil {
-							er := fmt.Errorf("error: copyDstSubProcFunc: open file failed: %v", err)
+							er := fmt.Errorf("error: copyDstSubProcFunc: open destination chunk file for writing failed: %v", err)
 							return er
 						}
 						defer fh.Close()
 
 						_, err = fh.Write(csa.CopyData)
 						if err != nil {
-							er := fmt.Errorf("error: copyDstSubProcFunc: open file failed: %v", err)
+							er := fmt.Errorf("error: copyDstSubProcFunc: writing to chunk file failed: %v", err)
 							return er
 						}
 
@@ -714,13 +745,27 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
 						// Open the main file that chunks files will be written into.
 						filePath := filepath.Join(cia.DstDir, cia.DstFile)
 
+						// HERE:
+						er := fmt.Errorf("info: Before creating folder: cia.FolderPermission: %04o", cia.FolderPermission)
+						proc.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
+
+						if _, err := os.Stat(cia.DstDir); os.IsNotExist(err) {
+							// TODO: Add option to set permission here ???
+							err := os.MkdirAll(cia.DstDir, fs.FileMode(cia.FolderPermission))
+							if err != nil {
+								return fmt.Errorf("error: failed to create destination directory for file copying %v: %v", cia.DstDir, err)
+							}
+							er := fmt.Errorf("info: Created folder: with cia.FolderPermission: %04o", cia.FolderPermission)
+							proc.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
+						}
+
 						// Rename the file so we got a backup.
 						backupOriginalFileName := filePath + ".bck"
 						os.Rename(filePath, backupOriginalFileName)
 
 						mainfh, err := os.OpenFile(filePath, os.O_TRUNC|os.O_RDWR|os.O_CREATE|os.O_SYNC, cia.FileMode)
 						if err != nil {
-							er := fmt.Errorf("error: copyDstSubProcFunc: open file failed: %v", err)
+							er := fmt.Errorf("error: copyDstSubProcFunc: open final destination file failed: %v", err)
 							proc.errorKernel.errSend(proc, message, er)
 							return er
 						}
@@ -811,7 +856,7 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
 							return er
 						}
 
-						er := fmt.Errorf("info: copy: successfully wrote all split chunk files into file=%v", filePath)
+						er = fmt.Errorf("info: copy: successfully wrote all split chunk files into file=%v", filePath)
 						proc.errorKernel.logConsoleOnlyIfDebug(er, proc.configuration)
 
 						// Signal back to src that we are done, so it can cancel the process.

tui.go

@@ -787,7 +787,7 @@ func (t *tui) console(app *tview.Application) tview.Primitive {
 			select {
 			case messageData := <-t.toConsoleCh:
 				for _, v := range messageData {
-					fmt.Fprintf(p.outputForm, "%v", v)
+					fmt.Fprintf(p.outputForm, "%v", string(v))
 				}
 			case <-t.ctx.Done():
 				log.Printf("info: stopped tui toConsole worker\n")