Skip to content

Commit

Permalink
Merge pull request #94 from ucan-wg/base64-string
Browse files Browse the repository at this point in the history
container: I/O as strings for base64
  • Loading branch information
MichaelMure authored Dec 11, 2024
2 parents c3c2c96 + ce6d163 commit 47156a8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
9 changes: 5 additions & 4 deletions pkg/container/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"io"
"iter"
"strings"

"github.com/ipfs/go-cid"
"github.com/ipld/go-ipld-prime"
Expand Down Expand Up @@ -151,8 +152,8 @@ func FromCborReader(r io.Reader) (Reader, error) {
}

// FromCborBase64 decodes a base64 DAG-CBOR encoded container.
func FromCborBase64(data []byte) (Reader, error) {
return FromCborBase64Reader(bytes.NewReader(data))
func FromCborBase64(data string) (Reader, error) {
return FromCborBase64Reader(strings.NewReader(data))
}

// FromCborBase64Reader is the same as FromCborBase64, but with an io.Reader.
Expand Down Expand Up @@ -189,8 +190,8 @@ func FromCarReader(r io.Reader) (Reader, error) {
}

// FromCarBase64 decodes a base64 CAR file encoded container.
func FromCarBase64(data []byte) (Reader, error) {
return FromCarReader(bytes.NewReader(data))
func FromCarBase64(data string) (Reader, error) {
return FromCarReader(strings.NewReader(data))
}

// FromCarBase64Reader is the same as FromCarBase64, but with an io.Reader.
Expand Down
12 changes: 6 additions & 6 deletions pkg/container/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ func (ctn Writer) ToCborWriter(w io.Writer) error {
}

// ToCborBase64 encode the container into a base64 encoded DAG-CBOR binary format.
func (ctn Writer) ToCborBase64() ([]byte, error) {
func (ctn Writer) ToCborBase64() (string, error) {
var buf bytes.Buffer
err := ctn.ToCborBase64Writer(&buf)
if err != nil {
return nil, err
return "", err
}
return buf.Bytes(), nil
return buf.String(), nil
}

// ToCborBase64Writer is the same as ToCborBase64, but with an io.Writer.
Expand Down Expand Up @@ -91,13 +91,13 @@ func (ctn Writer) ToCarWriter(w io.Writer) error {
}

// ToCarBase64 encode the container into a base64 encoded CAR file.
func (ctn Writer) ToCarBase64() ([]byte, error) {
func (ctn Writer) ToCarBase64() (string, error) {
var buf bytes.Buffer
err := ctn.ToCarBase64Writer(&buf)
if err != nil {
return nil, err
return "", err
}
return buf.Bytes(), nil
return buf.String(), nil
}

// ToCarBase64Writer is the same as ToCarBase64, but with an io.Writer.
Expand Down

0 comments on commit 47156a8

Please sign in to comment.