alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

putio: make downloading files use the rclone http Client

Browse source 
This fixes `--download-header` and these transactions being missed from
`--dump bodies` or `--tpslimit`
This commit is contained in:
Nick Craig-Wood 2020-04-23 15:48:30 +01:00
parent f6346a4d29
commit 7c98ecd3ab
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/putio/fs.go
View file

@ -18,6 +18,7 @@ import (
"github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/config/configmap" "github.com/rclone/rclone/fs/config/configmap"
"github.com/rclone/rclone/fs/config/configstruct" "github.com/rclone/rclone/fs/config/configstruct"
"github.com/rclone/rclone/fs/fshttp"
"github.com/rclone/rclone/fs/hash" "github.com/rclone/rclone/fs/hash"
"github.com/rclone/rclone/lib/dircache" "github.com/rclone/rclone/lib/dircache"
"github.com/rclone/rclone/lib/oauthutil" "github.com/rclone/rclone/lib/oauthutil"
@ -34,7 +35,8 @@ type Fs struct {
client *putio.Client // client for making API calls to Put.io client *putio.Client // client for making API calls to Put.io
pacer *fs.Pacer // To pace the API calls pacer *fs.Pacer // To pace the API calls
dirCache *dircache.DirCache // Map of directory path to directory id dirCache *dircache.DirCache // Map of directory path to directory id
oAuthClient *http.Client httpClient *http.Client // base http client
oAuthClient *http.Client // http client with oauth Authorization
} }
// ------------------------------------------------------------ // ------------------------------------------------------------
@ -68,7 +70,8 @@ func NewFs(name, root string, m configmap.Mapper) (f fs.Fs, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
oAuthClient, _, err := oauthutil.NewClient(name, m, putioConfig) httpClient := fshttp.NewClient(fs.Config)
oAuthClient, _, err := oauthutil.NewClientWithBaseClient(name, m, putioConfig, httpClient)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to configure putio") return nil, errors.Wrap(err, "failed to configure putio")
} }
@ -78,6 +81,7 @@ func NewFs(name, root string, m configmap.Mapper) (f fs.Fs, err error) {
opt: *opt, opt: *opt,
pacer: fs.NewPacer(pacer.NewDefault(pacer.MinSleep(minSleep), pacer.MaxSleep(maxSleep), pacer.DecayConstant(decayConstant))), pacer: fs.NewPacer(pacer.NewDefault(pacer.MinSleep(minSleep), pacer.MaxSleep(maxSleep), pacer.DecayConstant(decayConstant))),
client: putio.NewClient(oAuthClient), client: putio.NewClient(oAuthClient),
httpClient: httpClient,
oAuthClient: oAuthClient, oAuthClient: oAuthClient,
} }
p.features = (&fs.Features{ p.features = (&fs.Features{

2
backend/putio/object.go
View file

@ -241,7 +241,7 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (in io.Read
req.Header.Set(header, value) req.Header.Set(header, value)
} }
// fs.Debugf(o, "opening file: id=%d", o.file.ID) // fs.Debugf(o, "opening file: id=%d", o.file.ID)
resp, err = http.DefaultClient.Do(req) resp, err = o.fs.httpClient.Do(req)
return shouldRetry(err) return shouldRetry(err)
}) })
if perr, ok := err.(*putio.ErrorResponse); ok && perr.Response.StatusCode >= 400 && perr.Response.StatusCode <= 499 { if perr, ok := err.(*putio.ErrorResponse); ok && perr.Response.StatusCode >= 400 && perr.Response.StatusCode <= 499 {