github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 13:26:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

onedrive: Factor code into fs.FixRangeOption

Browse Source
This commit is contained in:
Nick Craig-Wood 2018-01-22 17:05:00 +00:00
parent c098e25552
commit d876392d15
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/onedrive/onedrive.go
View File

@ -1065,18 +1065,7 @@ func (o *Object) Open(options ...fs.OpenOption) (in io.ReadCloser, err error) {
if o.id == "" {
return nil, errors.New("can't download - no id")
}
for i := range options {
option := options[i]
if x, ok := option.(*fs.RangeOption); ok {
// Fix RangeOption if requesting a fetch from
// the end as it doesn't work with Onedrive.
// If start is < 0 then fetch from the end
if x.Start < 0 {
x = &fs.RangeOption{Start: o.size - x.End, End: -1}
options[i] = x
}
}
}
fs.FixRangeOption(options, o.size)
var resp *http.Response
opts := rest.Opts{
Method: "GET",

18
fs/options.go
View File

@ -62,6 +62,24 @@ func (o *RangeOption) Mandatory() bool {
return false
}
// FixRangeOption looks through the slice of options and adjusts any
// RangeOption~s found that request a fetch from the end into an
// absolute fetch using the size passed in. Some remotes (eg
// Onedrive, Box) don't support range requests which index from the
// end.
func FixRangeOption(options []OpenOption, size int64) {
for i := range options {
option := options[i]
if x, ok := option.(*RangeOption); ok {
// If start is < 0 then fetch from the end
if x.Start < 0 {
x = &RangeOption{Start: size - x.End, End: -1}
options[i] = x
}
}
}
}
// SeekOption defines an HTTP Range option with start only.
type SeekOption struct {
Offset int64