Merge branch 'staging' into hm90121-patch-3

cmd/copy.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/spf13/cobra"
 )
@@ -40,9 +41,15 @@ var copyCmd = &cobra.Command{
 		remotePath := cmd.Flag("remotepath").Value.String()
 		destPath := cmd.Flag("destpath").Value.String()
 
-		err = allocationObj.CopyObject(remotePath, destPath)
+		err = allocationObj.DoMultiOperation([]sdk.OperationRequest{
+			{
+				OperationType: constants.FileOperationCopy,
+				RemotePath:    remotePath,
+				DestPath:      destPath,
+			},
+		})
 		if err != nil {
-			PrintError("Error performing CopyObject", err)
+			PrintError("Copy failed.", err)
 			os.Exit(1)
 		}
 

cmd/createdir.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/spf13/cobra"
 )
@@ -32,14 +33,15 @@ var createDirCmd = &cobra.Command{
 		}
 		dirname := cmd.Flag("dirname").Value.String()
 
-		if err != nil {
-			PrintError("CreateDir failed: ", err)
-			os.Exit(1)
-		}
-		err = allocationObj.CreateDir(dirname)
+		err = allocationObj.DoMultiOperation([]sdk.OperationRequest{
+			{
+				OperationType: constants.FileOperationCreateDir,
+				RemotePath:    dirname,
+			},
+		})
 
 		if err != nil {
-			PrintError("CreateDir failed: ", err)
+			PrintError("Directory creation failed.", err)
 			os.Exit(1)
 		}
 

cmd/delete.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/spf13/cobra"
 )
@@ -15,12 +16,12 @@ var deleteCmd = &cobra.Command{
 	Long:  `delete file from blobbers`,
 	Args:  cobra.MinimumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		fflags := cmd.Flags()                      // fflags is a *flag.FlagSet
-		if fflags.Changed("allocation") == false { // check if the flag "path" is set
+		fflags := cmd.Flags()              // fflags is a *flag.FlagSet
+		if !fflags.Changed("allocation") { // check if the flag "path" is set
 			PrintError("Error: allocation flag is missing") // If not, we'll let the user know
 			os.Exit(1)                                      // and return
 		}
-		if fflags.Changed("remotepath") == false {
+		if !fflags.Changed("remotepath") {
 			PrintError("Error: remotepath flag is missing")
 			os.Exit(1)
 		}
@@ -33,7 +34,12 @@ var deleteCmd = &cobra.Command{
 		}
 		remotePath := cmd.Flag("remotepath").Value.String()
 
-		err = allocationObj.DeleteFile(remotePath)
+		err = allocationObj.DoMultiOperation([]sdk.OperationRequest{
+			{
+				OperationType: constants.FileOperationDelete,
+				RemotePath:    remotePath,
+			},
+		})
 		if err != nil {
 			PrintError("Delete failed.", err.Error())
 			os.Exit(1)

cmd/download.go

@@ -139,7 +139,7 @@ var downloadCmd = &cobra.Command{
 				}
 			}
 		} else if len(remotePath) > 0 {
-			if fflags.Changed("allocation") == false { // check if the flag "path" is set
+			if !fflags.Changed("allocation") { // check if the flag "path" is set
 				PrintError("Error: allocation flag is missing") // If not, we'll let the user know
 				os.Exit(1)                                      // and return
 			}
@@ -168,7 +168,7 @@ var downloadCmd = &cobra.Command{
 				}
 			}
 		} else if len(multidownloadJSON) > 0 {
-			if fflags.Changed("allocation") == false { // check if the flag "path" is set
+			if !fflags.Changed("allocation") { // check if the flag "path" is set
 				PrintError("Error: allocation flag is missing") // If not, we'll let the user know
 				os.Exit(1)                                      // and return
 			}

cmd/move.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/spf13/cobra"
 )
@@ -38,9 +39,15 @@ var moveCmd = &cobra.Command{
 		remotePath := cmd.Flag("remotepath").Value.String()
 		destPath := cmd.Flag("destpath").Value.String()
 
-		err = allocationObj.MoveObject(remotePath, destPath)
+		err = allocationObj.DoMultiOperation([]sdk.OperationRequest{
+			{
+				OperationType: constants.FileOperationMove,
+				RemotePath:    remotePath,
+				DestPath:      destPath,
+			},
+		})
 		if err != nil {
-			PrintError("Error performing CopyObject", err)
+			PrintError("Move failed.", err)
 			os.Exit(1)
 		}
 

cmd/rename.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/core/pathutil"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/spf13/cobra"
@@ -16,17 +17,17 @@ var renameCmd = &cobra.Command{
 	Long:  `rename an object on blobbers`,
 	Args:  cobra.MinimumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
-		fflags := cmd.Flags()                      // fflags is a *flag.FlagSet
-		if fflags.Changed("allocation") == false { // check if the flag "path" is set
+		fflags := cmd.Flags()              // fflags is a *flag.FlagSet
+		if !fflags.Changed("allocation") { // check if the flag "path" is set
 			PrintError("Error: allocation flag is missing") // If not, we'll let the user know
 			os.Exit(1)                                      // and os.Exit(1)
 		}
-		if fflags.Changed("remotepath") == false {
+		if !fflags.Changed("remotepath") {
 			PrintError("Error: remotepath flag is missing")
 			os.Exit(1)
 		}
 
-		if fflags.Changed("destname") == false {
+		if !fflags.Changed("destname") {
 			PrintError("Error: destname flag is missing")
 			os.Exit(1)
 		}
@@ -44,9 +45,15 @@ var renameCmd = &cobra.Command{
 			return
 		}
 
-		err = allocationObj.RenameObject(remotePath, destName)
+		err = allocationObj.DoMultiOperation([]sdk.OperationRequest{
+			{
+				OperationType: constants.FileOperationRename,
+				RemotePath:    remotePath,
+				DestName:      destName,
+			},
+		})
 		if err != nil {
-			PrintError(err.Error())
+			PrintError("Rename failed.", err)
 			os.Exit(1)
 		}
 		fmt.Println(remotePath + " renamed")

cmd/update.go

@@ -16,11 +16,11 @@ var updateCmd = &cobra.Command{
 	Args:  cobra.MinimumNArgs(0),
 	Run: func(cmd *cobra.Command, args []string) {
 		fflags := cmd.Flags()
-		if fflags.Changed("allocation") == false {
+		if !fflags.Changed("allocation") {
 			PrintError("Error: allocation flag is missing")
 			os.Exit(1)
 		}
-		if fflags.Changed("remotepath") == false {
+		if !fflags.Changed("remotepath") {
 			PrintError("Error: remotepath flag is missing")
 			os.Exit(1)
 		}
@@ -47,17 +47,7 @@ var updateCmd = &cobra.Command{
 
 		wg := &sync.WaitGroup{}
 		statusBar := &StatusBar{wg: wg}
-		wg.Add(1)
-
-		err = startChunkedUpload(cmd, allocationObj, chunkedUploadArgs{
-			localPath:     localPath,
-			remotePath:    remotePath,
-			thumbnailPath: thumbnailPath,
-			encrypt:       encrypt,
-			chunkNumber:   updateChunkNumber,
-			isUpdate:      true,
-			// isRepair:      false,
-		}, statusBar)
+		err = singleUpload(allocationObj, localPath, remotePath, thumbnailPath, encrypt, false, true, updateChunkNumber, statusBar)
 
 		if err != nil {
 			PrintError("Update failed.", err)

cmd/upload.go

@@ -61,21 +61,10 @@ var uploadCmd = &cobra.Command{
 		if multiuploadJSON != "" {
 			err = multiUpload(allocationObj, localPath, multiuploadJSON, statusBar)
 		} else {
-			wg.Add(1)
-			err = startChunkedUpload(cmd, allocationObj,
-				chunkedUploadArgs{
-					localPath:     localPath,
-					thumbnailPath: thumbnailPath,
-					remotePath:    remotePath,
-					encrypt:       encrypt,
-					webStreaming:  webStreaming,
-					chunkNumber:   uploadChunkNumber,
-					// isUpdate:      false,
-					// isRepair:      false,
-				}, statusBar)
+			err = singleUpload(allocationObj, localPath, remotePath, thumbnailPath, encrypt, webStreaming, false, uploadChunkNumber, statusBar)
 		}
 		if err != nil {
-			PrintError("Upload failed.", err.Error())
+			PrintError("Upload failed.", err)
 			os.Exit(1)
 		}
 		wg.Wait()
@@ -97,7 +86,7 @@ type chunkedUploadArgs struct {
 	isRepair     bool
 }
 
-func startChunkedUpload(cmd *cobra.Command, allocationObj *sdk.Allocation, args chunkedUploadArgs, statusBar sdk.StatusCallback) error {
+func startChunkedUpload(allocationObj *sdk.Allocation, args chunkedUploadArgs, statusBar sdk.StatusCallback) error {
 	fileReader, err := os.Open(args.localPath)
 	if err != nil {
 		return err
@@ -148,12 +137,14 @@ func startChunkedUpload(cmd *cobra.Command, allocationObj *sdk.Allocation, args
 }
 
 type MultiUploadOption struct {
-	FilePath      string `json:"filePath,omitempty"`
-	FileName      string `json:"fileName,omitempty"`
-	RemotePath    string `json:"remotePath,omitempty"`
-	ThumbnailPath string `json:"thumbnailPath,omitempty"`
-	Encrypt       bool   `json:"encrypt,omitempty"`
-	ChunkNumber   int    `json:"chunkNumber,omitempty"`
+	FilePath       string `json:"filePath,omitempty"`
+	FileName       string `json:"fileName,omitempty"`
+	RemotePath     string `json:"remotePath,omitempty"`
+	ThumbnailPath  string `json:"thumbnailPath,omitempty"`
+	Encrypt        bool   `json:"encrypt,omitempty"`
+	ChunkNumber    int    `json:"chunkNumber,omitempty"`
+	IsUpdate       bool   `json:"isUpdate,omitempty"`
+	IsWebstreaming bool   `json:"isWebstreaming,omitempty"`
 }
 
 func multiUpload(allocationObj *sdk.Allocation, workdir, jsonMultiUploadOptions string, statusBar *StatusBar) error {
@@ -172,13 +163,43 @@ func multiUpload(allocationObj *sdk.Allocation, workdir, jsonMultiUploadOptions
 		return err
 	}
 
+	return multiUploadWithOptions(allocationObj, workdir, options, statusBar)
+}
+
+func singleUpload(allocationObj *sdk.Allocation, localPath, remotePath, thumbnailPath string, encrypt, isWebstreaming, isUpdate bool, chunkNumber int, statusBar *StatusBar) error {
+	fullRemotePath, fileName, err := fullPathAndFileNameForUpload(localPath, remotePath)
+	if err != nil {
+		return err
+	}
+	remotePath = pathutil.Dir(fullRemotePath) + "/"
+	options := []MultiUploadOption{
+		{
+			FilePath:       localPath,
+			FileName:       fileName,
+			RemotePath:     remotePath,
+			ThumbnailPath:  thumbnailPath,
+			Encrypt:        encrypt,
+			ChunkNumber:    chunkNumber,
+			IsUpdate:       isUpdate,
+			IsWebstreaming: isWebstreaming,
+		},
+	}
+
+	workdir := util.GetHomeDir()
+
+	return multiUploadWithOptions(allocationObj, workdir, options, statusBar)
+}
+
+func multiUploadWithOptions(allocationObj *sdk.Allocation, workdir string, options []MultiUploadOption, statusBar *StatusBar) error {
 	totalUploads := len(options)
 	filePaths := make([]string, totalUploads)
 	fileNames := make([]string, totalUploads)
 	remotePaths := make([]string, totalUploads)
 	thumbnailPaths := make([]string, totalUploads)
 	chunkNumbers := make([]int, totalUploads)
 	encrypts := make([]bool, totalUploads)
+	isUpdates := make([]bool, totalUploads)
+	isWebstreaming := make([]bool, totalUploads)
 	for idx, option := range options {
 		statusBar.wg.Add(1)
 		filePaths[idx] = option.FilePath
@@ -187,9 +208,11 @@ func multiUpload(allocationObj *sdk.Allocation, workdir, jsonMultiUploadOptions
 		remotePaths[idx] = option.RemotePath
 		chunkNumbers[idx] = option.ChunkNumber
 		encrypts[idx] = option.Encrypt
+		isUpdates[idx] = option.IsUpdate
+		isWebstreaming[idx] = option.IsWebstreaming
 	}
 
-	return allocationObj.StartMultiUpload(workdir, filePaths, fileNames, thumbnailPaths, encrypts, chunkNumbers, remotePaths, false, statusBar)
+	return allocationObj.StartMultiUpload(workdir, filePaths, fileNames, thumbnailPaths, encrypts, chunkNumbers, remotePaths, isUpdates, isWebstreaming, statusBar)
 }
 
 func init() {

go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/0chain/errors v1.0.3
-	github.com/0chain/gosdk v1.8.17-0.20230809212922-e71a28baf114
+	github.com/0chain/gosdk v1.8.18-0.20230901213317-53d640a9b7f9
 	github.com/icza/bitio v1.1.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/spf13/cobra v1.6.0

go.sum

@@ -40,8 +40,8 @@ github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 h1:z+DtCR8mBsjPnEs
 github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565/go.mod h1:UyDC8Qyl5z9lGkCnf9RHJPMektnFX8XtCJZHXCCVj8E=
 github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
 github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
-github.com/0chain/gosdk v1.8.17-0.20230809212922-e71a28baf114 h1:fgaUQSUpAqhjhD3ONmiY+3yWn56qHADEd0TCoRcDSZ0=
-github.com/0chain/gosdk v1.8.17-0.20230809212922-e71a28baf114/go.mod h1:3NKNYzmnMIYqZwwwOgZwMmTW1DT1ZUAmKyVPmYQOiT4=
+github.com/0chain/gosdk v1.8.18-0.20230901213317-53d640a9b7f9 h1:GHTdYTmhNY9genBkNWLXdn3Z1yCtcbSNkcIFaKrqBRU=
+github.com/0chain/gosdk v1.8.18-0.20230901213317-53d640a9b7f9/go.mod h1:3NKNYzmnMIYqZwwwOgZwMmTW1DT1ZUAmKyVPmYQOiT4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw=