gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build error

Browse Source
This commit is contained in:
tnextday
2015-11-30 00:21:42 +08:00
parent 1817864a45
commit f825d23789
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
go/operation/chunked_file.go
View File

@@ -15,8 +15,8 @@ var ErrOutOfRange = errors.New("Out of Range")
type ChunkInfo struct { type ChunkInfo struct {
Fid string `json:"fid,omitempty"` Fid string `json:"fid,omitempty"`
Offset uint64 `json:"offset,omitempty"` Offset int64 `json:"offset,omitempty"`
Size uint32 `json:"size,omitempty"` Size int64 `json:"size,omitempty"`
} }
type ChunkList []*ChunkInfo type ChunkList []*ChunkInfo
@@ -24,7 +24,7 @@ type ChunkList []*ChunkInfo
type ChunkedFile struct { type ChunkedFile struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Mime string `json:"mime,omitempty"` Mime string `json:"mime,omitempty"`
Size uint64 `json:"size,omitempty"` Size int64 `json:"size,omitempty"`
Chunks ChunkList `json:"chunks,omitempty"` Chunks ChunkList `json:"chunks,omitempty"`
master string `json:"-"` master string `json:"-"`
@@ -62,15 +62,15 @@ func copyChunk(fileUrl string, w io.Writer, startOffset, size int64) (written in
if err != nil { if err != nil {
return written, err return written, err
} }
defer resp.Close() defer resp.Body.Close()
if startOffset > 0 && resp.StatusCode != 206 { if startOffset > 0 && resp.StatusCode != 206 {
return written, fmt.Errorf("Cannot Read Needle Position: %d [%s]", startOffset, fileUrl) return written, fmt.Errorf("Cannot Read Needle Position: %d [%s]", startOffset, fileUrl)
} }
if size > 0 { if size > 0 {
return io.CopyN(w, resp, size) return io.CopyN(w, resp.Body, size)
} else { } else {
return io.Copy(w, resp) return io.Copy(w, resp.Body)
} }
} }
@@ -79,7 +79,7 @@ func (c *ChunkedFile) WriteBuffer(w io.Writer, offset, size int64) (written int6
return written, ErrOutOfRange return written, ErrOutOfRange
} }
chunkIndex := -1 chunkIndex := -1
chunkStartOffset := 0 chunkStartOffset := int64(0)
for i, ci := range c.Chunks { for i, ci := range c.Chunks {
if offset >= ci.Offset && offset < ci.Offset+ci.Size { if offset >= ci.Offset && offset < ci.Offset+ci.Size {
chunkIndex = i chunkIndex = i
@@ -90,13 +90,14 @@ func (c *ChunkedFile) WriteBuffer(w io.Writer, offset, size int64) (written int6
if chunkIndex < 0 { if chunkIndex < 0 {
return written, ErrOutOfRange return written, ErrOutOfRange
} }
//preload next chunk?
for ; chunkIndex < c.Chunks.Len(); chunkIndex++ { for ; chunkIndex < c.Chunks.Len(); chunkIndex++ {
ci := c.Chunks[chunkIndex] ci := c.Chunks[chunkIndex]
fileUrl, lookupError := LookupFileId(c.master, ci.Fid) fileUrl, lookupError := LookupFileId(c.master, ci.Fid)
if lookupError != nil { if lookupError != nil {
return written, lookupError return written, lookupError
} }
rsize := 0 rsize := int64(0)
if size > 0 { if size > 0 {
rsize = size - written rsize = size - written
} }