Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

client: Add methods which accept a Context #171

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

client: Add methods which accept a Context #171

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
16 changes: 14 additions & 2 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package client

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
Expand Down Expand Up @@ -83,6 +84,11 @@ type Response struct {

// Convert a file from a local path using the http client
func (c *Client) Convert(r io.Reader, filename string) (*Response, error) {
return c.ConvertWithContext(context.Background(), r, filename)
}

// ConvertWithContext is identical to Convert but allows for passing in a context.
func (c *Client) ConvertWithContext(ctx context.Context, r io.Reader, filename string) (*Response, error) {
buf := &bytes.Buffer{}
w := multipart.NewWriter(buf)
part, err := w.CreateFormFile("input", filename)
Expand All @@ -96,7 +102,7 @@ func (c *Client) Convert(r io.Reader, filename string) (*Response, error) {
return nil, err
}

req, err := http.NewRequest("POST", fmt.Sprintf("%v%v/convert", c.protocol, c.endpoint), buf)
req, err := http.NewRequestWithContext(ctx, "POST", fmt.Sprintf("%v%v/convert", c.protocol, c.endpoint), buf)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -128,11 +134,17 @@ func (c *Client) Convert(r io.Reader, filename string) (*Response, error) {
// ConvertPath uses the docconv Client to convert the local file
// found at path.
func ConvertPath(c *Client, path string) (*Response, error) {
return ConvertPathWithContext(c, context.Background(), path)
}

// ConvertPathWithContext is identical to ConvertPath but allows for
// passing in a context.
func ConvertPathWithContext(c *Client, ctx context.Context, path string) (*Response, error) {
f, err := os.Open(path)
if err != nil {
return nil, err
}
defer f.Close()

return c.Convert(f, f.Name())
return c.ConvertWithContext(ctx, f, f.Name())
}