Skip to content
Merged
Changes from all commits
Commits
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
38 changes: 31 additions & 7 deletions remotes/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,42 @@ func LookupFileInTARFile(file File, fileName string) File {
return nil, err
}
if head.Name == fileName {
return struct {
io.Reader
io.Closer
}{
Reader: tarReader,
Closer: reader,
}, nil
return newFileInTARFile(reader, head, tarReader)
}
}
})
}

type SeekReaderAt interface {
io.Reader
io.Seeker
io.ReaderAt
}

func newFileInTARFile(r io.ReadCloser, h *tar.Header, tr *tar.Reader) (io.ReadCloser, error) {
seekReaderAt, ok := r.(SeekReaderAt)
if !ok || h.Typeflag != tar.TypeReg {
return struct {
io.Reader
io.Closer
}{
Reader: tr,
Closer: r,
}, nil
}
offset, err := seekReaderAt.Seek(0, io.SeekCurrent)
if err != nil {
return nil, err
}
return struct {
io.Closer
SeekReaderAt
}{
Closer: r,
SeekReaderAt: io.NewSectionReader(seekReaderAt, offset, h.Size),
}, nil
}

func GzipReaderFromZstdUpstream(upstream io.ReadCloser) (io.ReadCloser, error) {
zreader, err := zstd.NewReader(upstream)
if err != nil {
Expand Down
Loading