extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-10 16:28:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

backend/http: parse get responses when no_head is set

Browse Source
This commit is contained in:
Arnie97 2022-03-20 15:40:20 +08:00 committed by Nick Craig-Wood
parent 92ffcf9f86
commit cafce96185
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
backend/http/http.go
View File

@ -305,7 +305,7 @@ func (f *Fs) NewObject(ctx context.Context, remote string) (fs.Object, error) {
fs: f, fs: f,
remote: remote, remote: remote,
} }
err := o.stat(ctx) err := o.head(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -500,7 +500,7 @@ func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err e
fs: f, fs: f,
remote: remote, remote: remote,
} }
switch err := file.stat(ctx); err { switch err := file.head(ctx); err {
case nil: case nil:
add(file) add(file)
case fs.ErrorNotAFile: case fs.ErrorNotAFile:
@ -579,8 +579,8 @@ func (o *Object) url() string {
return o.fs.url(o.remote) return o.fs.url(o.remote)
} }
// stat updates the info field in the Object // head sends a HEAD request to update info fields in the Object
func (o *Object) stat(ctx context.Context) error { func (o *Object) head(ctx context.Context) error {
if o.fs.opt.NoHead { if o.fs.opt.NoHead {
o.size = -1 o.size = -1
o.modTime = timeUnset o.modTime = timeUnset
@ -601,6 +601,11 @@ func (o *Object) stat(ctx context.Context) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to stat: %w", err) return fmt.Errorf("failed to stat: %w", err)
} }
return o.stat(ctx, res)
}
// stat updates info fields in the Object according to HTTP response headers
func (o *Object) stat(ctx context.Context, res *http.Response) error {
t, err := http.ParseTime(res.Header.Get("Last-Modified")) t, err := http.ParseTime(res.Header.Get("Last-Modified"))
if err != nil { if err != nil {
t = timeUnset t = timeUnset
@ -653,6 +658,12 @@ func (o *Object) Open(ctx context.Context, options ...fs.OpenOption) (in io.Read
if err != nil { if err != nil {
return nil, fmt.Errorf("Open failed: %w", err) return nil, fmt.Errorf("Open failed: %w", err)
} }
if o.fs.opt.NoHead {
if err = o.stat(ctx, res); err != nil {
return nil, fmt.Errorf("Stat failed: %w", err)
}
}
return res.Body, nil return res.Body, nil
} }