Feat/available after (#194)

Author: cnlangzi

.gitignore

@@ -27,3 +27,4 @@ sp_lock.sh
 rp_lock.sh
 .idea/
 .vscode
+go.work

Makefile

@@ -28,10 +28,10 @@ gomod-clean:
 
 $(ZBOX): gomod-download
 	$(eval VERSION=$(shell git describe --tags --dirty --always))
-	go build -x -v -tags bn256 -ldflags "-X main.VersionStr=$(VERSION)" -o $(ZBOX) main.go
+	CGO_ENABLED=1 go build -x -v -tags bn256 -ldflags "-X main.VersionStr=$(VERSION)" -o $(ZBOX) main.go
 
 zboxcli-test:
-	go test -tags bn256 ./...
+	CGO_ENABLED=1 go test -tags bn256 ./...
 
 install: $(ZBOX) zboxcli-test
 

README.md

@@ -4,7 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
+	"github.com/0chain/gosdk/core/common"
 	"github.com/0chain/gosdk/zboxcore/fileref"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/spf13/cobra"
@@ -51,8 +53,10 @@ var shareCmd = &cobra.Command{
 		}
 
 		var fileName string
+
 		_, fileName = filepath.Split(remotepath)
 		refereeClientID := cmd.Flag("clientid").Value.String()
+
 		revoke, _ := cmd.Flags().GetBool("revoke")
 		if revoke {
 			err := allocationObj.RevokeShare(remotepath, refereeClientID)
@@ -62,9 +66,29 @@ var shareCmd = &cobra.Command{
 			}
 			fmt.Println("Share revoked for client " + refereeClientID)
 		} else {
-			expiration, _ := cmd.Flags().GetInt64("expiration-seconds")
+			expiration, err := cmd.Flags().GetInt64("expiration-seconds")
+			if err != nil {
+				PrintError(err.Error())
+				os.Exit(1)
+			}
+
+			availableAfter := time.Now()
+			availableAfterInput, err := cmd.Flags().GetString("available-after")
+			if err != nil {
+				PrintError(err.Error())
+				os.Exit(1)
+			}
+			if len(availableAfterInput) > 0 {
+				aa, err := common.ParseTime(availableAfter, availableAfterInput)
+				if err != nil {
+					PrintError(err.Error())
+					os.Exit(1)
+				}
+				availableAfter = *aa
+			}
+
 			encryptionpublickey := cmd.Flag("encryptionpublickey").Value.String()
-			ref, err := allocationObj.GetAuthTicket(remotepath, fileName, refType, refereeClientID, encryptionpublickey, expiration)
+			ref, err := allocationObj.GetAuthTicket(remotepath, fileName, refType, refereeClientID, encryptionpublickey, expiration, &availableAfter)
 			if err != nil {
 				PrintError(err.Error())
 				os.Exit(1)
@@ -81,6 +105,7 @@ func init() {
 	shareCmd.PersistentFlags().String("clientid", "", "ClientID of the user to share with. Leave blank for public share")
 	shareCmd.PersistentFlags().String("encryptionpublickey", "", "Encryption public key of the client you want to share with. Can be retrieved by the getwallet command")
 	shareCmd.PersistentFlags().Int64("expiration-seconds", 0, "Authticket will expire when the seconds specified have elapsed after the instant of its creation")
+	shareCmd.PersistentFlags().String("available-after", "", "Timelock for private file that makes the file available for download at certain time. 4 inputs are supported: +1h30m, +30, 1647858200 and 2022-03-21 10:21:38")
 	shareCmd.PersistentFlags().Bool("revoke", false, "Revoke share for remotepath")
 	shareCmd.MarkFlagRequired("allocation")
 	shareCmd.MarkFlagRequired("remotepath")

cmd/share.go

@@ -156,7 +156,16 @@ var syncCmd = &cobra.Command{
 
 				encrypt := len(encryptpath) != 0 && strings.Contains(lPath, encryptpath)
 
-				err = startChunkedUpload(cmd, allocationObj, lPath, "", f.Path, encrypt, chunkSize, attrs, statusBar, false)
+				err = startChunkedUpload(cmd, allocationObj, chunkedUploadArgs{
+					localPath:     lPath,
+					thumbnailPath: "",
+					remotePath:    f.Path,
+					encrypt:       encrypt,
+					chunkSize:     chunkSize,
+					attrs:         attrs,
+					// isUpdate:      false,
+					// isRepair: false,
+				}, statusBar)
 
 				// if len(encryptpath) != 0 && strings.Contains(lPath, encryptpath) {
 				// 	err = allocationObj.EncryptAndUploadFile(lPath, f.Path, attrs, statusBar)
@@ -168,7 +177,17 @@ var syncCmd = &cobra.Command{
 
 				encrypt := len(encryptpath) != 0 && strings.Contains(lPath, encryptpath)
 
-				err = startChunkedUpload(cmd, allocationObj, lPath, "", f.Path, encrypt, chunkSize, f.Attributes, statusBar, true)
+				err = startChunkedUpload(cmd, allocationObj,
+					chunkedUploadArgs{
+						localPath:     lPath,
+						thumbnailPath: "",
+						remotePath:    f.Path,
+						encrypt:       encrypt,
+						chunkSize:     chunkSize,
+						attrs:         f.Attributes,
+						isUpdate:      true,
+						// isRepair: false,
+					}, statusBar)
 
 				// if len(encryptpath) != 0 && strings.Contains(lPath, encryptpath) {
 				// 	err = allocationObj.EncryptAndUpdateFile(lPath, f.Path,

cmd/sync.go

@@ -65,7 +65,16 @@ var updateCmd = &cobra.Command{
 		statusBar := &StatusBar{wg: wg}
 		wg.Add(1)
 
-		err = startChunkedUpload(cmd, allocationObj, localpath, thumbnailpath, remotepath, encrypt, chunkSize, attrs, statusBar, true)
+		err = startChunkedUpload(cmd, allocationObj, chunkedUploadArgs{
+			localPath:     localpath,
+			remotePath:    remotepath,
+			thumbnailPath: thumbnailpath,
+			encrypt:       encrypt,
+			chunkSize:     chunkSize,
+			attrs:         attrs,
+			isUpdate:      true,
+			// isRepair:      false,
+		}, statusBar)
 
 		if err != nil {
 			PrintError("Update failed.", err)

cmd/update.go

@@ -115,7 +115,17 @@ var uploadCmd = &cobra.Command{
 
 		chunkSize, _ := cmd.Flags().GetInt("chunksize")
 
-		if err := startChunkedUpload(cmd, allocationObj, localpath, thumbnailpath, remotepath, encrypt, chunkSize, attrs, statusBar, false); err != nil {
+		if err := startChunkedUpload(cmd, allocationObj,
+			chunkedUploadArgs{
+				localPath:     localpath,
+				thumbnailPath: thumbnailpath,
+				remotePath:    remotepath,
+				encrypt:       encrypt,
+				chunkSize:     chunkSize,
+				attrs:         attrs,
+				// isUpdate:      false,
+				// isRepair:      false,
+			}, statusBar); err != nil {
 			PrintError("Upload failed.", err.Error())
 			os.Exit(1)
 		}
@@ -285,9 +295,21 @@ var streamCmd = &cobra.Command{
 	},
 }
 
-func startChunkedUpload(cmd *cobra.Command, allocationObj *sdk.Allocation, localPath, thumbnailPath, remotePath string, encrypt bool, chunkSize int, attrs fileref.Attributes, statusBar sdk.StatusCallback, isUpdate bool) error {
+type chunkedUploadArgs struct {
+	localPath     string
+	remotePath    string
+	thumbnailPath string
 
-	fileReader, err := os.Open(localPath)
+	encrypt   bool
+	chunkSize int
+	isUpdate  bool
+	isRepair  bool
+	attrs     fileref.Attributes
+}
+
+func startChunkedUpload(cmd *cobra.Command, allocationObj *sdk.Allocation, args chunkedUploadArgs, statusBar sdk.StatusCallback) error {
+
+	fileReader, err := os.Open(args.localPath)
 	if err != nil {
 		return err
 	}
@@ -303,29 +325,29 @@ func startChunkedUpload(cmd *cobra.Command, allocationObj *sdk.Allocation, local
 		return err
 	}
 
-	remotePath = zboxutil.RemoteClean(remotePath)
+	remotePath := zboxutil.RemoteClean(args.remotePath)
 	isabs := zboxutil.IsRemoteAbs(remotePath)
 	if !isabs {
 		err = thrown.New("invalid_path", "Path should be valid and absolute")
 		return err
 	}
-	remotePath = zboxutil.GetFullRemotePath(localPath, remotePath)
+	remotePath = zboxutil.GetFullRemotePath(args.localPath, remotePath)
 
 	_, fileName := filepath.Split(remotePath)
 
 	fileMeta := sdk.FileMeta{
-		Path:       localPath,
+		Path:       args.localPath,
 		ActualSize: fileInfo.Size(),
 		MimeType:   mimeType,
 		RemoteName: fileName,
 		RemotePath: remotePath,
-		Attributes: attrs,
+		Attributes: args.attrs,
 	}
 
-	ChunkedUpload, err := sdk.CreateChunkedUpload(util.GetHomeDir(), allocationObj, fileMeta, fileReader, isUpdate, false,
-		sdk.WithThumbnailFile(thumbnailPath),
-		sdk.WithChunkSize(int64(chunkSize)),
-		sdk.WithEncrypt(encrypt),
+	ChunkedUpload, err := sdk.CreateChunkedUpload(util.GetHomeDir(), allocationObj, fileMeta, fileReader, args.isUpdate, args.isRepair,
+		sdk.WithThumbnailFile(args.thumbnailPath),
+		sdk.WithChunkSize(int64(args.chunkSize)),
+		sdk.WithEncrypt(args.encrypt),
 		sdk.WithStatusCallback(statusBar))
 	if err != nil {
 		return err

cmd/upload.go

@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/0chain/errors v1.0.3
-	github.com/0chain/gosdk v1.7.7-0.20220318082026-d86de83b3f08
+	github.com/0chain/gosdk v1.7.7-0.20220323125839-f117ab4bbf72
 	github.com/icza/bitio v1.1.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/spf13/cobra v1.1.1

go.mod

@@ -49,8 +49,8 @@ collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 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.7.7-0.20220318082026-d86de83b3f08 h1:9MBNKx1kdocfNOoaT4ES/VJ+4QTEZuGmgcRL1kbm+Tk=
-github.com/0chain/gosdk v1.7.7-0.20220318082026-d86de83b3f08/go.mod h1:Cch/iwYKdBMnwcsFm2x9hG4CLYTVChCRFqA1TKRmRXU=
+github.com/0chain/gosdk v1.7.7-0.20220323125839-f117ab4bbf72 h1:P4oSjHnFaKTmWp5FQXD+p2EM77pUslECv7oja+tSzmw=
+github.com/0chain/gosdk v1.7.7-0.20220323125839-f117ab4bbf72/go.mod h1:Cch/iwYKdBMnwcsFm2x9hG4CLYTVChCRFqA1TKRmRXU=
 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
 github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc=
 github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4=