Skip to content

lexgen: add inputEncoding param when encoding is */* #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boltlessengineer wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −9
Open

lexgen: add inputEncoding param when encoding is */* #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/atproto/repouploadBlob.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions fakedata/generators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func GenProfile(xrpcc *xrpc.Client, acc *AccountContext, genAvatar, genBanner bo
var avatar *lexutil.LexBlob
if genAvatar {
img := gofakeit.ImagePng(200, 200)
resp, err := comatproto.RepoUploadBlob(context.TODO(), xrpcc, bytes.NewReader(img))
resp, err := comatproto.RepoUploadBlob(context.TODO(), xrpcc, bytes.NewReader(img), "")
if err != nil {
return err
}
Expand All @@ -104,7 +104,7 @@ func GenProfile(xrpcc *xrpc.Client, acc *AccountContext, genAvatar, genBanner bo
var banner *lexutil.LexBlob
if genBanner {
img := gofakeit.ImageJpeg(800, 200)
resp, err := comatproto.RepoUploadBlob(context.TODO(), xrpcc, bytes.NewReader(img))
resp, err := comatproto.RepoUploadBlob(context.TODO(), xrpcc, bytes.NewReader(img), "")
if err != nil {
return err
}
Expand Down Expand Up @@ -175,7 +175,7 @@ func GenPosts(xrpcc *xrpc.Client, catalog *AccountCatalog, acc *AccountContext,
var images []*appbsky.EmbedImages_Image
if fracImage > 0.0 && rand.Float64() < fracImage {
img := gofakeit.ImageJpeg(800, 800)
resp, err := comatproto.RepoUploadBlob(context.TODO(), xrpcc, bytes.NewReader(img))
resp, err := comatproto.RepoUploadBlob(context.TODO(), xrpcc, bytes.NewReader(img), "")
if err != nil {
return err
}
Expand Down
11 changes: 7 additions & 4 deletions lex/type_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,16 @@ func (s *TypeSchema) WriteRPC(w io.Writer, typename, inputname string) error {

params := "ctx context.Context, c lexutil.LexClient"
inpvar := "nil"
inpenc := ""
inpenc := "\"\""

if s.Input != nil {
inpvar = "input"
inpenc = s.Input.Encoding
inpenc = fmt.Sprintf("%q", s.Input.Encoding)
switch s.Input.Encoding {
case EncodingCBOR, EncodingCAR, EncodingANY, EncodingMP4:
case EncodingANY:
inpenc = "inputEncoding"
params = fmt.Sprintf("%s, input io.Reader, inputEncoding string", params)
case EncodingCBOR, EncodingCAR, EncodingMP4:
params = fmt.Sprintf("%s, input io.Reader", params)
case EncodingJSON:
params = fmt.Sprintf("%s, input *%s", params, inputname)
Expand Down Expand Up @@ -180,7 +183,7 @@ func (s *TypeSchema) WriteRPC(w io.Writer, typename, inputname string) error {
return fmt.Errorf("can only generate RPC for Query or Procedure (got %s)", s.Type)
}

pf("\tif err := c.LexDo(ctx, %s, %q, \"%s\", %s, %s, %s); err != nil {\n", reqtype, inpenc, s.id, queryparams, inpvar, outvar)
pf("\tif err := c.LexDo(ctx, %s, %s, \"%s\", %s, %s, %s); err != nil {\n", reqtype, inpenc, s.id, queryparams, inpvar, outvar)
pf("\t\treturn %s\n", errRet)
pf("\t}\n\n")
pf("\treturn %s\n", outRet)
Expand Down