73763b954f
Clarify logic that extra data is stored when the target buffer is full. Existing logic allows for extra data to be stored even when more data will be read into buffer when the remaining space is less than what was copied from the last receive. Signed-off-by: Derek McGowan <derek@mcgstyle.net>
50 lines
860 B
Go
50 lines
860 B
Go
package content
|
|
|
|
import (
|
|
contentapi "github.com/containerd/containerd/api/services/content"
|
|
)
|
|
|
|
type remoteReader struct {
|
|
client contentapi.Content_ReadClient
|
|
extra []byte
|
|
}
|
|
|
|
func (rr *remoteReader) Read(p []byte) (n int, err error) {
|
|
n += copy(p, rr.extra)
|
|
if n >= len(p) {
|
|
if n <= len(rr.extra) {
|
|
rr.extra = rr.extra[n:]
|
|
} else {
|
|
rr.extra = rr.extra[:0]
|
|
}
|
|
return
|
|
}
|
|
rr.extra = rr.extra[:0]
|
|
|
|
p = p[n:]
|
|
for len(p) > 0 {
|
|
var resp *contentapi.ReadResponse
|
|
// fill our buffer up until we can fill p.
|
|
resp, err = rr.client.Recv()
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
copied := copy(p, resp.Data)
|
|
n += copied
|
|
p = p[copied:]
|
|
|
|
if len(p) == 0 {
|
|
rr.extra = append(rr.extra, resp.Data[copied:]...)
|
|
}
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
// TODO(stevvooe): Implemente io.ReaderAt.
|
|
|
|
func (rr *remoteReader) Close() error {
|
|
return rr.client.CloseSend()
|
|
}
|