TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

drive: fix stats accounting for upload - fixes #970, #968

Browse source
This commit is contained in:
Stefan Breunig 2017-07-04 19:56:46 +02:00
parent e86f62c3e8
commit ee13bc6775
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drive/upload.go
View file

@ -11,7 +11,6 @@
package drive package drive
import ( import (
"bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
@ -110,9 +109,8 @@ func (f *Fs) Upload(in io.Reader, size int64, contentType string, info *drive.Fi
} }
// Make an http.Request for the range passed in // Make an http.Request for the range passed in
func (rx *resumableUpload) makeRequest(start int64, body []byte) *http.Request { func (rx *resumableUpload) makeRequest(start int64, body io.ReadSeeker, reqSize int64) *http.Request {
reqSize := int64(len(body)) req, _ := http.NewRequest("POST", rx.URI, body)
req, _ := http.NewRequest("POST", rx.URI, bytes.NewBuffer(body))
req.ContentLength = reqSize req.ContentLength = reqSize
if reqSize != 0 { if reqSize != 0 {
req.Header.Set("Content-Range", fmt.Sprintf("bytes %v-%v/%v", start, start+reqSize-1, rx.ContentLength)) req.Header.Set("Content-Range", fmt.Sprintf("bytes %v-%v/%v", start, start+reqSize-1, rx.ContentLength))
@ -131,7 +129,7 @@ var rangeRE = regexp.MustCompile(`^0\-(\d+)$`)
// //
// If error is nil, then start should be valid // If error is nil, then start should be valid
func (rx *resumableUpload) transferStatus() (start int64, err error) { func (rx *resumableUpload) transferStatus() (start int64, err error) {
req := rx.makeRequest(0, nil) req := rx.makeRequest(0, nil, 0)
res, err := rx.f.client.Do(req) res, err := rx.f.client.Do(req)
if err != nil { if err != nil {
return 0, err return 0, err
@ -158,8 +156,8 @@ func (rx *resumableUpload) transferStatus() (start int64, err error) {
} }
// Transfer a chunk - caller must call googleapi.CloseBody(res) if err == nil || res != nil // Transfer a chunk - caller must call googleapi.CloseBody(res) if err == nil || res != nil
func (rx *resumableUpload) transferChunk(start int64, body []byte) (int, error) { func (rx *resumableUpload) transferChunk(start int64, chunk io.ReadSeeker, chunkSize int64) (int, error) {
req := rx.makeRequest(start, body) req := rx.makeRequest(start, chunk, chunkSize)
res, err := rx.f.client.Do(req) res, err := rx.f.client.Do(req)
if err != nil { if err != nil {
return 599, err return 599, err
@ -194,26 +192,19 @@ func (rx *resumableUpload) transferChunk(start int64, body []byte) (int, error)
// It retries each chunk maxTries times (with a pause of uploadPause between attempts). // It retries each chunk maxTries times (with a pause of uploadPause between attempts).
func (rx *resumableUpload) Upload() (*drive.File, error) { func (rx *resumableUpload) Upload() (*drive.File, error) {
start := int64(0) start := int64(0)
buf := make([]byte, chunkSize)
var StatusCode int var StatusCode int
var err error
for start < rx.ContentLength { for start < rx.ContentLength {
reqSize := rx.ContentLength - start reqSize := rx.ContentLength - start
if reqSize >= int64(chunkSize) { if reqSize >= int64(chunkSize) {
reqSize = int64(chunkSize) reqSize = int64(chunkSize)
} else {
buf = buf[:reqSize]
}
// Read the chunk
_, err := io.ReadFull(rx.Media, buf)
if err != nil {
return nil, err
} }
chunk := fs.NewRepeatableReader(io.LimitReader(rx.Media, reqSize))
// Transfer the chunk // Transfer the chunk
err = rx.f.pacer.Call(func() (bool, error) { err = rx.f.pacer.Call(func() (bool, error) {
fs.Debugf(rx.remote, "Sending chunk %d length %d", start, reqSize) fs.Debugf(rx.remote, "Sending chunk %d length %d", start, reqSize)
StatusCode, err = rx.transferChunk(start, buf) StatusCode, err = rx.transferChunk(start, chunk, reqSize)
again, err := shouldRetry(err) again, err := shouldRetry(err)
if StatusCode == statusResumeIncomplete || StatusCode == http.StatusCreated || StatusCode == http.StatusOK { if StatusCode == statusResumeIncomplete || StatusCode == http.StatusCreated || StatusCode == http.StatusOK {
again = false again = false