Added parameter to control upload range size

Author: virtualzone

VERSION

@@ -1 +1 @@
-v0.6.2
+v0.7.0

main.go

@@ -12,9 +12,10 @@ import (
 )
 
 type Flags struct {
-	ConfigPath string
-	Verbose    bool
-	Quiet      bool
+	ConfigPath             string
+	Verbose                bool
+	Quiet                  bool
+	UploadSessionRangeSize int
 }
 
 var (
@@ -40,6 +41,7 @@ func printHelp() {
 
 func prepareFlags() {
 	flag.StringVar(&AppFlags.ConfigPath, "c", "", "path to config.json")
+	flag.IntVar(&AppFlags.UploadSessionRangeSize, "u", 320*30, "upload range size in KB (multiple of 320 KB)")
 	flag.BoolVar(&AppFlags.Quiet, "q", false, "output errors only")
 	flag.BoolVar(&AppFlags.Verbose, "v", false, "verbose output")
 	flag.Parse()
@@ -127,6 +129,7 @@ func main() {
 		client = sdk.CreateClient(conf)
 		client.UseTransferSignals = true
 		client.Verbose = AppFlags.Verbose
+		client.UploadSessionRangeSize = AppFlags.UploadSessionRangeSize
 		if cmdDef.InitSecretStore {
 			logVerbose("Reading secret store...")
 			if client.ShouldRenewAccessToken() {

sdk/client.go

@@ -22,6 +22,7 @@ type transferProgress func(int64)
 type Client struct {
 	Config                  *Config
 	Verbose                 bool
+	UploadSessionRangeSize  int
 	UseTransferSignals      bool
 	ChannelTransferStart    chan fs.FileInfo
 	ChannelTransferProgress chan int64
@@ -32,9 +33,10 @@ type HTTPRequestParams map[string]string
 
 func CreateClient(conf *Config) *Client {
 	client := &Client{
-		Config:             conf,
-		Verbose:            false,
-		UseTransferSignals: false,
+		Config:                 conf,
+		UploadSessionRangeSize: 320 * 30,
+		Verbose:                false,
+		UseTransferSignals:     false,
 	}
 	client.ResetChannels()
 	return client

sdk/integration_test.go

@@ -92,7 +92,7 @@ func TestUploadDownloadSmall(t *testing.T) {
 func TestUploadDownloadLarge(t *testing.T) {
 	dirName := "/test-" + uuid.New().String()
 	fileName := uuid.New().String() + ".dat"
-	fileSizeKB := (UploadSessionFileSizeLimit / 1000 * 2) + 10
+	fileSizeKB := (UploadSessionFileSizeLimit / 1024 * 2) + 10
 	err := createRandomFile("/tmp/"+fileName, fileSizeKB)
 	checkTestBool(t, true, err == nil)
 	defer os.Remove("/tmp/" + fileName)

sdk/upload.go

@@ -10,9 +10,8 @@ import (
 )
 
 var (
-	UploadSessionFileSizeLimit int = 4 * 1000 * 1000 // 4 MB
-	UploadSessionMultiple      int = 320 * 1024      // 320 KB
-	UploadSessionRangeSize     int = UploadSessionMultiple * 10
+	UploadSessionFileSizeLimit int = 10 * 1024 * 1024 // 10 MB
+	UploadSessionMultiple      int = 320 * 1024       // 320 KB
 )
 
 type UploadSessionResponse struct {
@@ -63,7 +62,11 @@ func (client *Client) Upload(localFilePath, targetFolder string) error {
 }
 
 func (client *Client) uploadToSession(uploadUrl, mimeType, localFilePath string, fileSize int64) error {
-	data := make([]byte, UploadSessionRangeSize)
+	if (client.UploadSessionRangeSize <= 0) || (client.UploadSessionRangeSize%320 != 0) {
+		return errors.New("upload session range size must be a multiple of 320")
+	}
+	rangeSizeBytes := client.UploadSessionRangeSize * 1024
+	data := make([]byte, rangeSizeBytes)
 	f, err := os.Open(localFilePath)
 	if err != nil {
 		return err
@@ -73,7 +76,7 @@ func (client *Client) uploadToSession(uploadUrl, mimeType, localFilePath string,
 	n := 0
 	for offset < fileSize {
 		n, _ = f.ReadAt(data, offset)
-		if n < UploadSessionRangeSize {
+		if n < rangeSizeBytes {
 			data = append([]byte(nil), data[:n]...)
 		}
 		progress := func(b int64) {

version.go

@@ -1,3 +1,3 @@
 package main
 
-var AppVersion = "v0.6.2"
+var AppVersion = "v0.7.0"