Skip to content

tar/asm: add NewInputTarStreamWithDone + tests #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jankaluza wants to merge 3 commits into
base: main
Choose a base branch
from
+586 −126
Open

tar/asm: add NewInputTarStreamWithDone + tests #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3706b08
tar/asm: add NewInputTarStreamWithDone + tests
jankaluza Jan 29, 2026
2237f5a
tar/asm: simplify done handling
jankaluza Feb 18, 2026
a293733
Use NewInputTarStreamWithDone everywhere.
jankaluza Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmd/tar-split/checksize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ func CommandChecksize(c *cli.Context) {

sp := storage.NewJSONPacker(packFh)
fp := storage.NewDiscardFilePutter()
dissam, err := asm.NewInputTarStream(fh, sp, fp)
dissam, done, err := asm.NewInputTarStreamWithDone(fh, sp, fp)
if err != nil {
log.Fatal(err)
}
defer dissam.Close()

var num int
tr := tar.NewReader(dissam)
Expand All @@ -64,6 +65,9 @@ func CommandChecksize(c *cli.Context) {
}
}
fmt.Printf(" -- number of files: %d\n", num)
if derr := <-done; derr != nil {
log.Fatal(derr)
}

if err := packFh.Sync(); err != nil {
log.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion cmd/tar-split/disasm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ func CommandDisasm(c *cli.Context) {

// we're passing nil here for the file putter, because the ApplyDiff will
// handle the extraction of the archive
its, err := asm.NewInputTarStream(inputStream, metaPacker, nil)
its, done, err := asm.NewInputTarStreamWithDone(inputStream, metaPacker, nil)
if err != nil {
logrus.Fatal(err)
}
defer its.Close()
var out io.Writer
if c.Bool("no-stdout") {
out = io.Discard
Expand All @@ -58,5 +59,8 @@ func CommandDisasm(c *cli.Context) {
if err != nil {
logrus.Fatal(err)
}
if derr := <-done; derr != nil {
logrus.Fatal(derr)
}
logrus.Infof("created %s from %s (read %d bytes)", c.String("output"), c.Args()[0], i)
}
12 changes: 10 additions & 2 deletions tar/asm/assemble_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,17 +163,21 @@ func TestTarStream(t *testing.T) {
fgp := storage.NewBufferFileGetPutter()

// wrap the disassembly stream
tarStream, err := NewInputTarStream(gzRdr, sp, fgp)
tarStream, done, err := NewInputTarStreamWithDone(gzRdr, sp, fgp)
if err != nil {
t.Fatal(err)
}
defer tarStream.Close()

// get a sum of the stream after it has passed through to ensure it's the same.
h0 := sha1.New()
i, err := io.Copy(h0, tarStream)
if err != nil {
t.Fatal(err)
}
if derr := <-done; derr != nil {
t.Fatal(derr)
}

if i != tc.expectedSize {
t.Errorf("size of tar: expected %d; got %d", tc.expectedSize, i)
Expand Down Expand Up @@ -227,15 +231,19 @@ func BenchmarkAsm(b *testing.B) {
fgp := storage.NewBufferFileGetPutter()

// wrap the disassembly stream
tarStream, err := NewInputTarStream(gzRdr, sp, fgp)
tarStream, done, err := NewInputTarStreamWithDone(gzRdr, sp, fgp)
if err != nil {
b.Fatal(err)
}
defer tarStream.Close()
// read it all to the bit bucket
i1, err := io.Copy(io.Discard, tarStream)
if err != nil {
b.Fatal(err)
}
if derr := <-done; derr != nil {
b.Fatal(derr)
}

r := bytes.NewBuffer(w.Bytes())
sup := storage.NewJSONUnpacker(r)
Expand Down
Loading