Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

camli/client: implement FetchStreaming, not Fetch

This commit is contained in:
Brad Fitzpatrick 2011-03-24 19:22:35 -07:00
parent 0e51761bbd
commit a774c3dc19
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/go/camli/client/get.go
View File

@ -42,11 +42,11 @@ func (c *Client) newRequest(method, url string) *http.Request {
return req return req
} }
func (c *Client) Fetch(b *blobref.BlobRef) (blobref.ReadSeekCloser, int64, os.Error) { func (c *Client) FetchStreaming(b *blobref.BlobRef) (io.ReadCloser, int64, os.Error) {
return c.FetchVia(b, nil) return c.FetchVia(b, nil)
} }
func (c *Client) FetchVia(b *blobref.BlobRef, v []*blobref.BlobRef) (blobref.ReadSeekCloser, int64, os.Error) { func (c *Client) FetchVia(b *blobref.BlobRef, v []*blobref.BlobRef) (io.ReadCloser, int64, os.Error) {
url := fmt.Sprintf("%s/camli/%s", c.server, b) url := fmt.Sprintf("%s/camli/%s", c.server, b)
if len(v) > 0 { if len(v) > 0 {
@ -76,14 +76,5 @@ func (c *Client) FetchVia(b *blobref.BlobRef, v []*blobref.BlobRef) (blobref.Rea
return nil, 0, os.NewError("blobserver didn't return a Content-Length for blob") return nil, 0, os.NewError("blobserver didn't return a Content-Length for blob")
} }
return nopSeeker{resp.Body}, size, nil return resp.Body, size, nil
} }
type nopSeeker struct {
io.ReadCloser
}
func (n nopSeeker) Seek(offset int64, whence int) (ret int64, err os.Error) {
return 0, os.NewError("seek unsupported")
}