github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1257 from stevvooe/content-changes

Browse Source 
content: remove Provider.Reader
This commit is contained in:
Stephen Day
2017-08-09 17:12:44 -07:00
committed by GitHub
parent f3ff1e223b 8be340e37b
commit e6ba48f25c
19 changed files with 105 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/ctr/content.go
View File

@@ -54,13 +54,13 @@ var (
return err
}
rc, err := cs.Reader(ctx, dgst)
ra, err := cs.ReaderAt(ctx, dgst)
if err != nil {
return err
}
defer rc.Close()
defer ra.Close()
_, err = io.Copy(os.Stdout, rc)
_, err = io.Copy(os.Stdout, content.NewReader(ra))
return err
},
}
@@ -306,24 +306,24 @@ var (
return err
}
content, err := getContentStore(context)
cs, err := getContentStore(context)
if err != nil {
return err
}
rc, err := content.Reader(ctx, dgst)
ra, err := cs.ReaderAt(ctx, dgst)
if err != nil {
return err
}
defer rc.Close()
defer ra.Close()
nrc, err := edit(rc)
nrc, err := edit(content.NewReader(ra))
if err != nil {
return err
}
defer nrc.Close()
wr, err := content.Writer(ctx, "edit-"+object, 0, "") // TODO(stevvooe): Choose a better key?
wr, err := cs.Writer(ctx, "edit-"+object, 0, "") // TODO(stevvooe): Choose a better key?
if err != nil {
return err
}

6
cmd/ctr/pushobject.go
View File

@@ -58,11 +58,11 @@ var pushObjectCommand = cli.Command{
Size: info.Size,
}
rc, err := cs.Reader(ctx, dgst)
ra, err := cs.ReaderAt(ctx, dgst)
if err != nil {
return err
}
defer rc.Close()
defer ra.Close()
cw, err := pusher.Push(ctx, desc)
if err != nil {
@@ -70,7 +70,7 @@ var pushObjectCommand = cli.Command{
}
// TODO: Progress reader
if err := content.Copy(cw, rc, desc.Size, desc.Digest); err != nil {
if err := content.Copy(cw, content.NewReader(ra), desc.Size, desc.Digest); err != nil {
return err
}