Skip to content

refactor: support context #7

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
Kryvchun wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: support context #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1116adf
refactor: support context
Jan 23, 2023
f3fc2b9
refactor: update examples
Jan 23, 2023
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
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,19 @@ package main
import (
"bufio"
"bytes"
"context"
"fmt"
"io/ioutil"
"net/url"
"os"
"strings"

"github.com/dyatlov/go-oembed/oembed"
)

func main() {
ctx := context.Background()

data, err := ioutil.ReadFile("../providers.json")

if err != nil {
Expand All @@ -40,6 +44,8 @@ func main() {
oe := oembed.NewOembed()
oe.ParseProviders(bytes.NewReader(data))

extras := url.Values{"autoplay": []string{"1"}}

for {

reader := bufio.NewReader(os.Stdin)
Expand All @@ -55,7 +61,7 @@ func main() {
item := oe.FindItem(url)

if item != nil {
info, err := item.FetchOembed(oembed.Options{URL: url})
info, err := item.FetchOembedWithContext(ctx, oembed.Options{URL: url, AcceptLanguage: "en-us", ExtraOpts: extras})
if err != nil {
fmt.Printf("An error occured: %s\n", err.Error())
} else {
Expand Down
5 changes: 4 additions & 1 deletion examples/simple.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"bufio"
"bytes"
"context"
"fmt"
"io/ioutil"
"net/url"
Expand All @@ -13,6 +14,8 @@ import (
)

func main() {
ctx := context.Background()

data, err := ioutil.ReadFile("../providers.json")

if err != nil {
Expand All @@ -39,7 +42,7 @@ func main() {
item := oe.FindItem(url)

if item != nil {
info, err := item.FetchOembed(oembed.Options{URL: url, AcceptLanguage: "en-us", ExtraOpts: extras})
info, err := item.FetchOembedWithContext(ctx, oembed.Options{URL: url, AcceptLanguage: "en-us", ExtraOpts: extras})
if err != nil {
fmt.Printf("An error occured: %s\n", err.Error())
} else {
Expand Down
11 changes: 8 additions & 3 deletions oembed/oembed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package oembed

import (
"context"
"encoding/json"
"fmt"
"io"
Expand Down Expand Up @@ -98,6 +99,11 @@ func (item *Item) parseOembed(u string, resp *http.Response) (*Info, error) {

// FetchOembed return oembed info from an url containing it
func (item *Item) FetchOembed(opts Options) (*Info, error) {
return item.FetchOembedWithContext(context.Background(), opts)
}

// FetchOembedWithContext return oembed info from an url containing it
func (item *Item) FetchOembedWithContext(ctx context.Context, opts Options) (*Info, error) {
resURL := item.ComposeURL(opts.URL)

params := url.Values{}
Expand All @@ -118,7 +124,7 @@ func (item *Item) FetchOembed(opts Options) (*Info, error) {
resURL = fmt.Sprintf("%s&%s", resURL, opts.ExtraOpts.Encode())
}

req, err := http.NewRequest("GET", resURL, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, resURL, nil)

if err != nil {
return nil, err
Expand All @@ -132,8 +138,7 @@ func (item *Item) FetchOembed(opts Options) (*Info, error) {
if opts.Client != nil {
resp, err = opts.Client.Do(req)
} else {
client := &http.Client{}
resp, err = client.Do(req)
resp, err = http.DefaultClient.Do(req)
}

if err != nil {
Expand Down