Skip to content

Commit

Permalink
update to reflect changes to sfomuseum/go-lookup v0.0.1; update vendo…
Browse files Browse the repository at this point in the history
…r deps
  • Loading branch information
thisisaaronland committed Jan 20, 2021
1 parent 4731c02 commit b65d26b
Show file tree
Hide file tree
Showing 606 changed files with 93,886 additions and 112,370 deletions.
30 changes: 17 additions & 13 deletions blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,27 @@ package blob
import (
"bytes"
"context"
"github.com/sfomuseum/go-lookup"
gc_blob "gocloud.dev/blob"
"io"
"io/ioutil"
"log"
"path/filepath"
"github.com/sfomuseum/go-lookup"
)

type BlobLookerUpper struct {
lookup.LookerUpper
bucket *gc_blob.Bucket
}

func NewBlobLookerUpper(ctx context.Context) lookup.LookerUpper {
l := &BlobLookerUpper{}
return l
func init() {

ctx := context.Background()
err := lookup.RegisterLookerUpper(ctx, "blob", NewBlobLookerUpper)

if err != nil {
panic(err)
}
}

func NewBlobLookerUpperWithBucket(ctx context.Context, bucket *gc_blob.Bucket) lookup.LookerUpper {
Expand All @@ -30,20 +35,19 @@ func NewBlobLookerUpperWithBucket(ctx context.Context, bucket *gc_blob.Bucket) l
return l
}

func (l *BlobLookerUpper) Open(ctx context.Context, uri string) error {

if l.bucket == nil {
func NewBlobLookerUpper(ctx context.Context, uri string) (lookup.LookerUpper, error) {

bucket, err := gc_blob.OpenBucket(ctx, uri)
bucket, err := gc_blob.OpenBucket(ctx, uri)

if err != nil {
return err
}
if err != nil {
return nil, err
}

l.bucket = bucket
l := &BlobLookerUpper{
bucket: bucket,
}

return nil
return l, nil
}

func (l *BlobLookerUpper) Append(ctx context.Context, lu lookup.Catalog, append_funcs ...lookup.AppendLookupFunc) error {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module github.com/sfomuseum/go-lookup-blob
go 1.12

require (
github.com/sfomuseum/go-lookup v0.0.0-20200102203002-01124d8c499b
gocloud.dev v0.18.0
github.com/sfomuseum/go-lookup v0.0.1
gocloud.dev v0.21.0
)
435 changes: 435 additions & 0 deletions go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions vendor/github.com/aaronland/go-roster/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions vendor/github.com/aaronland/go-roster/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/aaronland/go-roster/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

94 changes: 94 additions & 0 deletions vendor/github.com/aaronland/go-roster/default.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/aaronland/go-roster/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions vendor/github.com/aaronland/go-roster/roster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b65d26b

Please sign in to comment.