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

box: Parse file/directory size as a floating point number

Browse source 
Very large directories can have their sizes returned as floating point
numbers, eg `1.0034576985781e+14` from the box API.

Before this change this would fail to parse as an int64.

This change parses the size as a float64 instead which will be
perfectly accurate for sizes up to 2**56 which is about 9 PB.

It is unknown whether box themselves use a float64 as an intermediate
representation in the API or not - it seems likely.

Fixes #2261
This commit is contained in:
Nick Craig-Wood 2018-04-19 09:18:14 +01:00
parent 1f255a8567
commit a0c65deca8
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
backend/box/api/types.go
View file

@ -74,18 +74,18 @@ const (
// Item describes a folder or a file as returned by Get Folder Items and others // Item describes a folder or a file as returned by Get Folder Items and others
type Item struct { type Item struct {
Type string `json:"type"` Type string `json:"type"`
ID string `json:"id"` ID string `json:"id"`
SequenceID string `json:"sequence_id"` SequenceID string `json:"sequence_id"`
Etag string `json:"etag"` Etag string `json:"etag"`
SHA1 string `json:"sha1"` SHA1 string `json:"sha1"`
Name string `json:"name"` Name string `json:"name"`
Size int64 `json:"size"` Size float64 `json:"size"` // box returns this in xEyy format for very large numbers - see #2261
CreatedAt Time `json:"created_at"` CreatedAt Time `json:"created_at"`
ModifiedAt Time `json:"modified_at"` ModifiedAt Time `json:"modified_at"`
ContentCreatedAt Time `json:"content_created_at"` ContentCreatedAt Time `json:"content_created_at"`
ContentModifiedAt Time `json:"content_modified_at"` ContentModifiedAt Time `json:"content_modified_at"`
ItemStatus string `json:"item_status"` // active, trashed if the file has been moved to the trash, and deleted if the file has been permanently deleted ItemStatus string `json:"item_status"` // active, trashed if the file has been moved to the trash, and deleted if the file has been permanently deleted
} }
// ModTime returns the modification time of the item // ModTime returns the modification time of the item

2
backend/box/box.go
View file

@ -883,7 +883,7 @@ func (o *Object) setMetaData(info *api.Item) (err error) {
return errors.Wrapf(fs.ErrorNotAFile, "%q is %q", o.remote, info.Type) return errors.Wrapf(fs.ErrorNotAFile, "%q is %q", o.remote, info.Type)
} }
o.hasMetaData = true o.hasMetaData = true
o.size = info.Size o.size = int64(info.Size)
o.sha1 = info.SHA1 o.sha1 = info.SHA1
o.modTime = info.ModTime() o.modTime = info.ModTime()
o.id = info.ID o.id = info.ID