diff options
| author | Petter Rasmussen | 2016-04-09 18:04:39 +0200 | 
|---|---|---|
| committer | Petter Rasmussen | 2016-04-09 18:37:33 +0200 | 
| commit | 0e1057e475525536dce2db4754e9d9840ab086f2 (patch) | |
| tree | e1a1147ba447d8609752594140c82a109772c44c /drive/sync_upload.go | |
| parent | 401e017c5e821ba1dff9bc7e45e809b63c800192 (diff) | |
| download | gdrive-0e1057e475525536dce2db4754e9d9840ab086f2.tar.bz2 | |
Configurable timeout as argument #127
Diffstat (limited to 'drive/sync_upload.go')
| -rw-r--r-- | drive/sync_upload.go | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/drive/sync_upload.go b/drive/sync_upload.go index 0d5c208..c509c0a 100644 --- a/drive/sync_upload.go +++ b/drive/sync_upload.go @@ -20,6 +20,7 @@ type UploadSyncArgs struct {  	DryRun           bool  	DeleteExtraneous bool  	ChunkSize        int64 +	Timeout          time.Duration  	Resolution       ConflictResolution  	Comparer         FileComparer  } @@ -308,7 +309,7 @@ func (self *Drive) uploadMissingFile(parentId string, lf *LocalFile, args Upload  	progressReader := getProgressReader(srcFile, args.Progress, lf.info.Size())  	// Wrap reader in timeout reader -	reader, ctx := getTimeoutReaderContext(progressReader) +	reader, ctx := getTimeoutReaderContext(progressReader, args.Timeout)  	_, err = self.service.Files.Create(dstFile).Fields("id", "name", "size", "md5Checksum").Context(ctx).Media(reader, chunkSize).Do()  	if err != nil { @@ -347,7 +348,7 @@ func (self *Drive) updateChangedFile(cf *changedFile, args UploadSyncArgs, try i  	progressReader := getProgressReader(srcFile, args.Progress, cf.local.info.Size())  	// Wrap reader in timeout reader -	reader, ctx := getTimeoutReaderContext(progressReader) +	reader, ctx := getTimeoutReaderContext(progressReader, args.Timeout)  	_, err = self.service.Files.Update(cf.remote.file.Id, dstFile).Context(ctx).Media(reader, chunkSize).Do()  	if err != nil { | 
