diff --git a/internal/vaultik/blob_fetch_stub.go b/internal/vaultik/blob_fetch_stub.go deleted file mode 100644 index f1f85b4..0000000 --- a/internal/vaultik/blob_fetch_stub.go +++ /dev/null @@ -1,28 +0,0 @@ -package vaultik - -// TODO: These are stub implementations for methods referenced but not yet -// implemented. They allow the package to compile for testing. -// Remove once the real implementations land. - -import ( - "context" - "fmt" - "io" - - "filippo.io/age" -) - -// FetchAndDecryptBlobResult holds the result of fetching and decrypting a blob. -type FetchAndDecryptBlobResult struct { - Data []byte -} - -// FetchAndDecryptBlob downloads a blob, decrypts it, and returns the plaintext data. -func (v *Vaultik) FetchAndDecryptBlob(ctx context.Context, blobHash string, expectedSize int64, identity age.Identity) (*FetchAndDecryptBlobResult, error) { - return nil, fmt.Errorf("FetchAndDecryptBlob not yet implemented") -} - -// FetchBlob downloads a blob and returns a reader for the encrypted data. -func (v *Vaultik) FetchBlob(ctx context.Context, blobHash string, expectedSize int64) (io.ReadCloser, int64, error) { - return nil, 0, fmt.Errorf("FetchBlob not yet implemented") -} diff --git a/internal/vaultik/restore.go b/internal/vaultik/restore.go index 7dd42ff..80284d4 100644 --- a/internal/vaultik/restore.go +++ b/internal/vaultik/restore.go @@ -139,7 +139,7 @@ func (v *Vaultik) Restore(opts *RestoreOptions) error { progressbar.OptionSetWidth(40), progressbar.OptionThrottle(100*time.Millisecond), progressbar.OptionOnCompletion(func() { - _, _ = fmt.Fprint(v.Stderr, "\n") + v.printlnStderr() }), progressbar.OptionSetRenderBlankState(true), ) @@ -478,7 +478,9 @@ func (v *Vaultik) restoreRegularFile( if err != nil { return fmt.Errorf("downloading blob %s: %w", blobHashStr[:16], err) } - if putErr := blobCache.Put(blobHashStr, blobData); putErr != nil { log.Debug("Failed to cache blob on disk", "hash", blobHashStr[:16], "error", putErr) } + if putErr := blobCache.Put(blobHashStr, blobData); putErr != nil { + log.Debug("Failed to cache blob on disk", "hash", blobHashStr[:16], "error", putErr) + } result.BlobsDownloaded++ result.BytesDownloaded += blob.CompressedSize } diff --git a/internal/vaultik/vaultik.go b/internal/vaultik/vaultik.go index 4ad2c77..e360ba2 100644 --- a/internal/vaultik/vaultik.go +++ b/internal/vaultik/vaultik.go @@ -134,18 +134,11 @@ func (v *Vaultik) printfStdout(format string, args ...any) { _, _ = fmt.Fprintf(v.Stdout, format, args...) } - // printlnStdout writes a line to stdout. func (v *Vaultik) printlnStdout(args ...any) { _, _ = fmt.Fprintln(v.Stdout, args...) } -// scanlnStdin reads a line from stdin into the provided string pointer. -func (v *Vaultik) scanlnStdin(s *string) error { - _, err := fmt.Fscanln(v.Stdin, s) - return err -} - // FetchBlob downloads a blob from storage and returns a reader for the encrypted data. func (v *Vaultik) FetchBlob(ctx context.Context, blobHash string, expectedSize int64) (io.ReadCloser, int64, error) { blobPath := fmt.Sprintf("blobs/%s/%s/%s", blobHash[:2], blobHash[2:4], blobHash) @@ -163,6 +156,11 @@ func (v *Vaultik) printfStderr(format string, args ...any) { _, _ = fmt.Fprintf(v.Stderr, format, args...) } +// printlnStderr writes a line to stderr. +func (v *Vaultik) printlnStderr(args ...any) { + _, _ = fmt.Fprintln(v.Stderr, args...) +} + // scanStdin reads a line of input from stdin. func (v *Vaultik) scanStdin(a ...any) (int, error) { return fmt.Fscanln(v.Stdin, a...)