internal/pkg: return reader for files

This improves efficiency for cache hits.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/pkg/pkg.go

@@ -87,10 +87,11 @@ func (c *CureContext) Cure(a Artifact) (
 	return c.cache.Cure(a)
 }
 
-// LoadData tries to load [File] from [Cache], and if that fails, obtains it via
+// OpenFile tries to load [File] from [Cache], and if that fails, obtains it via
-// [File.Data] instead. Notably, it does not cure [File].
+// [File.Data] instead. Notably, it does not cure [File]. If err is nil, the
-func (c *CureContext) LoadData(f File) (data []byte, err error) {
+// caller is responsible for closing the resulting [io.ReadCloser].
-	return c.cache.loadData(f)
+func (c *CureContext) OpenFile(f File) (r io.ReadCloser, err error) {
+	return c.cache.openFile(f)
 }
 
 // An Artifact is a read-only reference to a piece of data that may be created
@@ -555,9 +556,8 @@ func (c *Cache) finaliseIdent(
 	close(done)
 }
 
-// loadData provides [CureContext.LoadData] for [Artifact.Cure].
+// openFile provides [CureContext.OpenFile] for [Artifact.Cure].
-func (c *Cache) loadData(f File) (data []byte, err error) {
+func (c *Cache) openFile(f File) (r io.ReadCloser, err error) {
-	var r *os.File
 	if kc, ok := f.(KnownChecksum); ok {
 		c.checksumMu.RLock()
 		r, err = os.Open(c.base.Append(
@@ -578,13 +578,11 @@ func (c *Cache) loadData(f File) (data []byte, err error) {
 		if !errors.Is(err, os.ErrNotExist) {
 			return
 		}
-		return f.Data()
+		var data []byte
-	}
+		if data, err = f.Data(); err != nil {
-
+			return
-	data, err = io.ReadAll(r)
+		}
-	closeErr := r.Close()
+		r = io.NopCloser(bytes.NewReader(data))
-	if err == nil {
-		err = closeErr
 	}
 	return
 }

internal/pkg/pkg_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"io"
 	"io/fs"
 	"net/http"
 	"os"
@@ -536,10 +537,14 @@ func TestCache(t *testing.T) {
 					fs.ModeDir | 0500,
 				)},
 
-				{"loadData directory", overrideIdent{pkg.ID{0xff, 3}, stubArtifact{
+				{"openFile directory", overrideIdent{pkg.ID{0xff, 3}, stubArtifact{
 					kind: pkg.KindTar,
 					cure: func(c *pkg.CureContext) error {
-						_, err := c.LoadData(overrideChecksumFile{checksum: wantChecksum})
+						r, err := c.OpenFile(overrideChecksumFile{checksum: wantChecksum})
+						if err != nil {
+							panic(err)
+						}
+						_, err = io.ReadAll(r)
 						return err
 					},
 				}}, nil, pkg.Checksum{}, &os.PathError{

internal/pkg/tar.go

@@ -2,7 +2,6 @@ package pkg
 
 import (
 	"archive/tar"
-	"bytes"
 	"compress/bzip2"
 	"compress/gzip"
 	"context"
@@ -78,12 +77,17 @@ func (a *tarArtifact) Cure(c *CureContext) (err error) {
 	var tr io.ReadCloser
 
 	{
-		var data []byte
+
-		data, err = c.LoadData(a.f)
+		if tr, err = c.OpenFile(a.f); err != nil {
-		if err != nil {
 			return
 		}
-		tr = io.NopCloser(bytes.NewReader(data))
+		defer func(f io.ReadCloser) {
+			closeErr := f.Close()
+			if err == nil {
+				err = closeErr
+			}
+		}(tr)
+		tr = io.NopCloser(tr)
 	}
 
 	defer func() {