refactor uploader

Author: cenkalti

internal/tus/tus.go

@@ -17,9 +17,23 @@ const (
 	uploadURL = "https://upload.put.io/files/"
 )
 
-func CreateUpload(baseCtx context.Context, httpClient *http.Client, timeout time.Duration, token string, filename string, parentID, length int64) (location string, err error) {
+type Uploader struct {
+	client  *http.Client
+	timeout time.Duration
+	token   string
+}
+
+func NewUploader(client *http.Client, timeout time.Duration, token string) *Uploader {
+	return &Uploader{
+		client:  client,
+		timeout: timeout,
+		token:   token,
+	}
+}
+
+func (u *Uploader) CreateUpload(baseCtx context.Context, filename string, parentID, length int64) (location string, err error) {
 	log.Debugf("Creating upload %q at parent=%d", filename, parentID)
-	ctx, cancel := context.WithTimeout(baseCtx, timeout)
+	ctx, cancel := context.WithTimeout(baseCtx, u.timeout)
 	defer cancel()
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, uploadURL, nil)
 	if err != nil {
@@ -33,9 +47,9 @@ func CreateUpload(baseCtx context.Context, httpClient *http.Client, timeout time
 	req.Header.Set("Content-Length", "0")
 	req.Header.Set("Upload-Length", strconv.FormatInt(length, 10))
 	req.Header.Set("Upload-Metadata", encodeMetadata(metadata))
-	req.Header.Set("Authorization", "token "+token)
+	req.Header.Set("Authorization", "token "+u.token)
 
-	resp, err := httpClient.Do(req)
+	resp, err := u.client.Do(req)
 	if err != nil {
 		return
 	}
@@ -50,15 +64,15 @@ func CreateUpload(baseCtx context.Context, httpClient *http.Client, timeout time
 	return
 }
 
-func SendFile(ctx context.Context, httpClient *http.Client, timeout time.Duration, token string, r io.Reader, location string, offset int64) (fileID int64, crc32 string, err error) {
+func (u *Uploader) SendFile(ctx context.Context, r io.Reader, location string, offset int64) (fileID int64, crc32 string, err error) {
 	log.Debugf("Sending file %q offset=%d", location, offset)
 
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
 	// Stop upload if speed is too slow.
 	// Wrap reader so each read call resets the timer that cancels the request on certain duration.
-	r = &timerResetReader{r: r, timer: time.AfterFunc(timeout, cancel), timeout: timeout}
+	r = &timerResetReader{r: r, timer: time.AfterFunc(u.timeout, cancel), timeout: u.timeout}
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodPatch, location, r)
 	if err != nil {
@@ -67,8 +81,8 @@ func SendFile(ctx context.Context, httpClient *http.Client, timeout time.Duratio
 
 	req.Header.Set("content-type", "application/offset+octet-stream")
 	req.Header.Set("upload-offset", strconv.FormatInt(offset, 10))
-	req.Header.Set("Authorization", "token "+token)
-	resp, err := httpClient.Do(req)
+	req.Header.Set("Authorization", "token "+u.token)
+	resp, err := u.client.Do(req)
 	if err != nil {
 		return
 	}
@@ -88,17 +102,17 @@ func SendFile(ctx context.Context, httpClient *http.Client, timeout time.Duratio
 	return
 }
 
-func GetOffset(ctx context.Context, httpClient *http.Client, timeout time.Duration, token string, location string) (n int64, err error) {
+func (u *Uploader) GetOffset(ctx context.Context, location string) (n int64, err error) {
 	log.Debugf("Getting upload offset %q", location)
-	ctx, cancel := context.WithTimeout(ctx, timeout)
+	ctx, cancel := context.WithTimeout(ctx, u.timeout)
 	defer cancel()
 	req, err := http.NewRequestWithContext(ctx, http.MethodHead, location, nil)
 	if err != nil {
 		return
 	}
 
-	req.Header.Set("Authorization", "token "+token)
-	resp, err := httpClient.Do(req)
+	req.Header.Set("Authorization", "token "+u.token)
+	resp, err := u.client.Do(req)
 	if err != nil {
 		return
 	}
@@ -114,17 +128,17 @@ func GetOffset(ctx context.Context, httpClient *http.Client, timeout time.Durati
 	return n, err
 }
 
-func TerminateuploadJob(ctx context.Context, httpClient *http.Client, timeout time.Duration, token string, location string) (err error) {
+func (u *Uploader) TerminateUpload(ctx context.Context, location string) (err error) {
 	log.Debugf("Terminating upload %q", location)
-	ctx, cancel := context.WithTimeout(ctx, timeout)
+	ctx, cancel := context.WithTimeout(ctx, u.timeout)
 	defer cancel()
 	req, err := http.NewRequestWithContext(ctx, http.MethodDelete, location, nil)
 	if err != nil {
 		return
 	}
 
-	req.Header.Set("Authorization", "token "+token)
-	resp, err := httpClient.Do(req)
+	req.Header.Set("Authorization", "token "+u.token)
+	resp, err := u.client.Do(req)
 	if err != nil {
 		return
 	}

job_state.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/cenkalti/log"
 	"github.com/putdotio/putio-sync/v2/internal/inode"
-	"github.com/putdotio/putio-sync/v2/internal/tus"
 )
 
 type deleteStateJob struct {
@@ -27,7 +26,7 @@ func (j *deleteStateJob) Run(ctx context.Context) error {
 		}
 	}
 	if j.state.UploadURL != "" {
-		err := tus.TerminateuploadJob(ctx, httpClient, defaultTimeout, token, j.state.UploadURL)
+		err := uploader.TerminateUpload(ctx, j.state.UploadURL)
 		if err != nil {
 			log.Errorln("cannot remove upload:", err.Error())
 		}

sync.go

@@ -12,6 +12,7 @@ import (
 	"github.com/putdotio/putio-sync/v2/internal/auth"
 	"github.com/putdotio/putio-sync/v2/internal/dircache"
 	"github.com/putdotio/putio-sync/v2/internal/tmpdir"
+	"github.com/putdotio/putio-sync/v2/internal/tus"
 	"github.com/putdotio/putio-sync/v2/internal/walker"
 	"go.etcd.io/bbolt"
 )
@@ -31,6 +32,7 @@ var (
 	remoteFolderID int64
 	dirCache       *dircache.DirCache
 	tempDirPath    string
+	uploader       *tus.Uploader
 )
 
 func Sync(ctx context.Context, config Config) error {
@@ -106,6 +108,7 @@ func syncOnce(ctx context.Context) error {
 		return err
 	}
 	dirCache = dircache.New(client, defaultTimeout, remoteFolderID)
+	uploader = tus.NewUploader(httpClient, defaultTimeout, token)
 
 	return syncRoots(ctx)
 }

upload.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/putdotio/putio-sync/v2/internal/inode"
 	"github.com/putdotio/putio-sync/v2/internal/progress"
-	"github.com/putdotio/putio-sync/v2/internal/tus"
 )
 
 type uploadJob struct {
@@ -38,7 +37,7 @@ func (d *uploadJob) tryResume(ctx context.Context) bool {
 	if d.state.LocalInode != in {
 		return false
 	}
-	offset, err := tus.GetOffset(ctx, httpClient, defaultTimeout, token, d.state.UploadURL)
+	offset, err := uploader.GetOffset(ctx, d.state.UploadURL)
 	if err != nil {
 		return false
 	}
@@ -58,7 +57,7 @@ func (d *uploadJob) Run(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		location, err := tus.CreateUpload(ctx, httpClient, defaultTimeout, token, filename, parentID, d.localFile.Info().Size())
+		location, err := uploader.CreateUpload(ctx, filename, parentID, d.localFile.Info().Size())
 		if err != nil {
 			return err
 		}
@@ -85,7 +84,7 @@ func (d *uploadJob) Run(ctx context.Context) error {
 	}
 	pr := progress.New(f, d.state.Offset, d.state.Size, d.String())
 	pr.Start()
-	fileID, crc32, err := tus.SendFile(ctx, httpClient, defaultTimeout, token, pr, d.state.UploadURL, d.state.Offset)
+	fileID, crc32, err := uploader.SendFile(ctx, pr, d.state.UploadURL, d.state.Offset)
 	pr.Stop()
 	if err != nil {
 		return err