stacktic/dropbox
Archived
1
0
Fork 0
Code Releases Activity

Merge pull request #20 from ncw/size-to-int64

Browse Source 
Make Entry.Size and ChunkUploadResponse.Offset be int64 - fixes #19
This commit is contained in:
Arnaud Ysmal 2015-08-04 19:56:54 +02:00
commit b7d75fe255
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto.go
View File

@ -199,7 +199,7 @@ func (db *Dropbox) DownloadAES(key []byte, src, rev string, offset int) (io.Read
var size int64 var size int64
var err error var err error
if in, size, err = db.Download(src, rev, offset); err != nil { if in, size, err = db.Download(src, rev, int64(offset)); err != nil {
return nil, err return nil, err
} }
return NewAESDecrypterReader(key, in, int(size)) return NewAESDecrypterReader(key, in, int(size))

10
dropbox.go
View File

@ -88,7 +88,7 @@ type DeltaPoll struct {
// ChunkUploadResponse represents the reply of chunked_upload. // ChunkUploadResponse represents the reply of chunked_upload.
type ChunkUploadResponse struct { type ChunkUploadResponse struct {
UploadID string `json:"upload_id"` // Unique ID of this upload. UploadID string `json:"upload_id"` // Unique ID of this upload.
Offset int `json:"offset"` // Size in bytes of already sent data. Offset int64 `json:"offset"` // Size in bytes of already sent data.
Expires DBTime `json:"expires"` // Expiration time of this upload. Expires DBTime `json:"expires"` // Expiration time of this upload.
} }
@ -166,7 +166,7 @@ type Modifier struct {
// Entry represents the metadata of a file or folder. // Entry represents the metadata of a file or folder.
type Entry struct { type Entry struct {
Bytes int `json:"bytes,omitempty"` // Size of the file in bytes. Bytes int64 `json:"bytes,omitempty"` // Size of the file in bytes.
ClientMtime DBTime `json:"client_mtime,omitempty"` // Modification time set by the client when added. ClientMtime DBTime `json:"client_mtime,omitempty"` // Modification time set by the client when added.
Contents []Entry `json:"contents,omitempty"` // List of children for a directory. Contents []Entry `json:"contents,omitempty"` // List of children for a directory.
Hash string `json:"hash,omitempty"` // Hash of this entry. Hash string `json:"hash,omitempty"` // Hash of this entry.
@ -572,7 +572,7 @@ func (db *Dropbox) ThumbnailsToFile(src, dst, format, size string) (*Entry, erro
// Download requests the file located at src, the specific revision may be given. // Download requests the file located at src, the specific revision may be given.
// offset is used in case the download was interrupted. // offset is used in case the download was interrupted.
// A io.ReadCloser and the file size is returned. // A io.ReadCloser and the file size is returned.
func (db *Dropbox) Download(src, rev string, offset int) (io.ReadCloser, int64, error) { func (db *Dropbox) Download(src, rev string, offset int64) (io.ReadCloser, int64, error) {
var request *http.Request var request *http.Request
var response *http.Response var response *http.Response
var rawurl string var rawurl string
@ -613,7 +613,7 @@ func (db *Dropbox) DownloadToFileResume(src, dst, rev string) error {
var input io.ReadCloser var input io.ReadCloser
var fi os.FileInfo var fi os.FileInfo
var fd *os.File var fd *os.File
var offset int var offset int64
var err error var err error
if fd, err = os.OpenFile(dst, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644); err != nil { if fd, err = os.OpenFile(dst, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644); err != nil {
@ -623,7 +623,7 @@ func (db *Dropbox) DownloadToFileResume(src, dst, rev string) error {
if fi, err = fd.Stat(); err != nil { if fi, err = fd.Stat(); err != nil {
return err return err
} }
offset = int(fi.Size()) offset = fi.Size()
if input, _, err = db.Download(src, rev, offset); err != nil { if input, _, err = db.Download(src, rev, offset); err != nil {
return err return err

2
dropbox_test.go
View File

@ -316,7 +316,7 @@ func TestFilesPut(t *testing.T) {
filename = "test.txt" filename = "test.txt"
content = []byte("file content") content = []byte("file content")
expected := Entry{Size: strconv.FormatInt(int64(len(content)), 10), Revision: "35e97029684fe", ThumbExists: false, Bytes: len(content), expected := Entry{Size: strconv.FormatInt(int64(len(content)), 10), Revision: "35e97029684fe", ThumbExists: false, Bytes: int64(len(content)),
Modified: DBTime(time.Date(2011, time.July, 19, 21, 55, 38, 0, time.UTC)), Path: "/" + filename, IsDir: false, Icon: "page_white_text", Modified: DBTime(time.Date(2011, time.July, 19, 21, 55, 38, 0, time.UTC)), Path: "/" + filename, IsDir: false, Icon: "page_white_text",
Root: "auto", MimeType: "text/plain"} Root: "auto", MimeType: "text/plain"}