feat: Add io.Reader-based API to archive cmd

pkg/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"io"
+	"io/fs"
 	"os"
 
 	"github.com/pojntfx/stfs/internal/persisters"
@@ -53,3 +54,10 @@ type CryptoConfig struct {
 type PasswordConfig struct {
 	Password string
 }
+
+type FileConfig struct {
+	GetFile func() (io.ReadSeekCloser, error)
+	Info    fs.FileInfo
+	Path    string
+	Link    string
+}

pkg/operations/archive.go

@@ -5,9 +5,6 @@ import (
 	"context"
 	"errors"
 	"io"
-	"io/fs"
-	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -19,7 +16,6 @@ import (
 	"github.com/pojntfx/stfs/internal/mtio"
 	"github.com/pojntfx/stfs/internal/records"
 	"github.com/pojntfx/stfs/internal/signature"
-	"github.com/pojntfx/stfs/internal/statext"
 	"github.com/pojntfx/stfs/internal/suffix"
 	"github.com/pojntfx/stfs/internal/tarext"
 	"github.com/pojntfx/stfs/pkg/config"
@@ -31,7 +27,7 @@ var (
 )
 
 func (o *Operations) Archive(
-	from string,
+	getSrc func() (config.FileConfig, error),
 	compressionLevel string,
 	overwrite bool,
 ) ([]*tar.Header, error) {
@@ -59,36 +55,31 @@ func (o *Operations) Archive(
 	}
 
 	hdrs := []*tar.Header{}
-	if err := filepath.Walk(from, func(path string, info fs.FileInfo, err error) error {
+	for {
+		file, err := getSrc()
+		if err == io.EOF {
+			break
+		}
+
 		if err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
-		link := ""
-		if info.Mode()&os.ModeSymlink == os.ModeSymlink {
-			if link, err = os.Readlink(path); err != nil {
-				return err
-			}
-		}
-
-		hdr, err := tar.FileInfoHeader(info, link)
+		hdr, err := tar.FileInfoHeader(file.Info, file.Link)
 		if err != nil {
 			// Skip sockets
 			if strings.Contains(err.Error(), errSocketsNotSupported.Error()) {
-				return nil
+				return []*tar.Header{}, nil
 			}
 
-			return err
+			return []*tar.Header{}, err
 		}
 
-		if err := statext.EnhanceHeader(path, hdr); err != nil {
-			return err
-		}
-
-		hdr.Name = path
+		hdr.Name = file.Path
 		hdr.Format = tar.FormatPAX
 
-		if info.Mode().IsRegular() {
+		var f io.ReadSeekCloser
+		if file.Info.Mode().IsRegular() {
 			// Get the compressed size for the header
 			fileSizeCounter := &ioext.CounterWriter{
 				Writer: io.Discard,
@@ -96,7 +87,7 @@ func (o *Operations) Archive(
 
 			encryptor, err := encryption.Encrypt(fileSizeCounter, o.pipes.Encryption, o.crypto.Recipient)
 			if err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
 			compressor, err := compression.Compress(
@@ -107,44 +98,41 @@ func (o *Operations) Archive(
 				o.pipes.RecordSize,
 			)
 			if err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
-			file, err := os.Open(path)
+			f, err = file.GetFile()
 			if err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
+			defer f.Close()
 
-			signer, sign, err := signature.Sign(file, writer.DriveIsRegular, o.pipes.Signature, o.crypto.Identity)
+			signer, sign, err := signature.Sign(f, writer.DriveIsRegular, o.pipes.Signature, o.crypto.Identity)
 			if err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
 			if writer.DriveIsRegular {
 				if _, err := io.Copy(compressor, signer); err != nil {
-					return err
+					return []*tar.Header{}, err
 				}
 			} else {
 				buf := make([]byte, mtio.BlockSize*o.pipes.RecordSize)
 				if _, err := io.CopyBuffer(compressor, signer, buf); err != nil {
-					return err
+					return []*tar.Header{}, err
 				}
 			}
 
-			if err := file.Close(); err != nil {
-				return err
-			}
-
 			if err := compressor.Flush(); err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
 			if err := compressor.Close(); err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
 			if err := encryptor.Close(); err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
 			if hdr.PAXRecords == nil {
@@ -153,7 +141,7 @@ func (o *Operations) Archive(
 			hdr.PAXRecords[records.STFSRecordUncompressedSize] = strconv.Itoa(int(hdr.Size))
 			signature, err := sign()
 			if err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
 			if signature != "" {
@@ -163,14 +151,14 @@ func (o *Operations) Archive(
 
 			hdr.Name, err = suffix.AddSuffix(hdr.Name, o.pipes.Compression, o.pipes.Encryption)
 			if err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 		}
 
 		if o.onHeader != nil {
 			dbhdr, err := converters.TarHeaderToDBHeader(-1, -1, -1, -1, hdr)
 			if err != nil {
-				return err
+				return []*tar.Header{}, err
 			}
 
 			o.onHeader(&config.HeaderEvent{
@@ -184,27 +172,27 @@ func (o *Operations) Archive(
 		hdrs = append(hdrs, &hdrToAppend)
 
 		if err := signature.SignHeader(hdr, writer.DriveIsRegular, o.pipes.Signature, o.crypto.Identity); err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
 		if err := encryption.EncryptHeader(hdr, o.pipes.Encryption, o.crypto.Recipient); err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
 		if err := tw.WriteHeader(hdr); err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
 		dirty = true
 
-		if !info.Mode().IsRegular() {
-			return nil
+		if !file.Info.Mode().IsRegular() {
+			continue
 		}
 
 		// Compress and write the file
 		encryptor, err := encryption.Encrypt(tw, o.pipes.Encryption, o.crypto.Recipient)
 		if err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
 		compressor, err := compression.Compress(
@@ -215,44 +203,35 @@ func (o *Operations) Archive(
 			o.pipes.RecordSize,
 		)
 		if err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
-		file, err := os.Open(path)
-		if err != nil {
-			return err
+		if _, err := f.Seek(0, io.SeekStart); err != nil {
+			return []*tar.Header{}, err
 		}
 
 		if writer.DriveIsRegular {
-			if _, err := io.Copy(compressor, file); err != nil {
-				return err
+			if _, err := io.Copy(compressor, f); err != nil {
+				return []*tar.Header{}, err
 			}
 		} else {
 			buf := make([]byte, mtio.BlockSize*o.pipes.RecordSize)
-			if _, err := io.CopyBuffer(compressor, file, buf); err != nil {
-				return err
+			if _, err := io.CopyBuffer(compressor, f, buf); err != nil {
+				return []*tar.Header{}, err
 			}
 		}
 
-		if err := file.Close(); err != nil {
-			return err
-		}
-
 		if err := compressor.Flush(); err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
 		if err := compressor.Close(); err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
 
 		if err := encryptor.Close(); err != nil {
-			return err
+			return []*tar.Header{}, err
 		}
-
-		return nil
-	}); err != nil {
-		return []*tar.Header{}, err
 	}
 
 	if err := cleanup(&dirty); err != nil {

pkg/operations/update.go

@@ -17,7 +17,6 @@ import (
 	"github.com/pojntfx/stfs/internal/mtio"
 	"github.com/pojntfx/stfs/internal/records"
 	"github.com/pojntfx/stfs/internal/signature"
-	"github.com/pojntfx/stfs/internal/statext"
 	"github.com/pojntfx/stfs/internal/suffix"
 	"github.com/pojntfx/stfs/internal/tarext"
 	"github.com/pojntfx/stfs/pkg/config"
@@ -66,10 +65,6 @@ func (o *Operations) Update(
 			return err
 		}
 
-		if err := statext.EnhanceHeader(path, hdr); err != nil {
-			return err
-		}
-
 		hdr.Name = path
 		hdr.Format = tar.FormatPAX
 		if hdr.PAXRecords == nil {