Skip to content

Commit

Permalink
call createFormFields in go func()
Browse files Browse the repository at this point in the history
del coment
  • Loading branch information
EkeMinusYou committed Oct 25, 2022
1 parent 25b8ea5 commit e08633c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
11 changes: 6 additions & 5 deletions misc.go
Expand Up @@ -155,14 +155,16 @@ func postLocalWithMultipartResponse(ctx context.Context, client httpClient, meth
func postWithMultipartResponse(ctx context.Context, client httpClient, path, name, fieldname, token string, values url.Values, r io.Reader, intf interface{}, d Debug) error {
pipeReader, pipeWriter := io.Pipe()
wr := multipart.NewWriter(pipeWriter)
err := createFormFields(wr, values)
if err != nil {
return err
}

errc := make(chan error)
go func() {
defer pipeWriter.Close()
defer wr.Close()
err := createFormFields(wr, values)
if err != nil {
errc <- err
return
}
ioWriter, err := wr.CreateFormFile(fieldname, name)
if err != nil {
errc <- err
Expand All @@ -183,7 +185,6 @@ func postWithMultipartResponse(ctx context.Context, client httpClient, path, nam
if err != nil {
return err
}
wr.Close()
req.Header.Add("Content-Type", wr.FormDataContentType())
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
resp, err := client.Do(req)
Expand Down
5 changes: 2 additions & 3 deletions remotefiles.go
Expand Up @@ -252,9 +252,7 @@ func (api *Client) UpdateRemoteFile(fileID string, params RemoteFileParameters)
// For more details see the UpdateRemoteFile documentation.
func (api *Client) UpdateRemoteFileContext(ctx context.Context, fileID string, params RemoteFileParameters) (remotefile *RemoteFile, err error) {
response := &remoteFileResponseFull{}
values := url.Values{
"token": {api.token},
}
values := url.Values{}
if fileID != "" {
values.Add("file", fileID)
}
Expand All @@ -276,6 +274,7 @@ func (api *Client) UpdateRemoteFileContext(ctx context.Context, fileID string, p
if params.PreviewImageReader != nil {
err = postWithMultipartResponse(ctx, api.httpclient, api.endpoint+"files.remote.update", "preview.png", "preview_image", api.token, values, params.PreviewImageReader, response, api)
} else {
values.Add("token", api.token)
response, err = api.remoteFileRequest(ctx, "files.remote.update", values)
}

Expand Down

0 comments on commit e08633c

Please sign in to comment.