From da225d099d7ed605fdb13dcf32b7af5e4f0ef1a5 Mon Sep 17 00:00:00 2001 From: John Pedrie Date: Wed, 17 Mar 2021 10:29:05 -0400 Subject: [PATCH 1/2] fix potential nil pointer error --- extract_comic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extract_comic.go b/extract_comic.go index ff52389..a5e2d68 100644 --- a/extract_comic.go +++ b/extract_comic.go @@ -105,7 +105,7 @@ func (e extractComic) findBestImage(a *Article) bool { eImgs.run(a) a.TopNode = nil - if a.Img != nil { + if a.Img != nil && a.Img.Sel != nil { return e.setImage(a, a.Img.Sel) } From 76879aac8edc44f3539df78b8e0e2d811fdb183b Mon Sep 17 00:00:00 2001 From: John Pedrie Date: Tue, 20 Apr 2021 13:06:11 -0400 Subject: [PATCH 2/2] apply timeout to http requests --- http.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/http.go b/http.go index 383111e..9938634 100644 --- a/http.go +++ b/http.go @@ -5,6 +5,8 @@ import ( "io" "net/http" "time" + + "golang.org/x/net/context" ) const ( @@ -18,7 +20,9 @@ var ( ) func httpGet(url string) (body io.ReadCloser, resp *http.Response, err error) { - req, err := http.NewRequest("GET", url, nil) + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + req, err := http.NewRequestWithContext(ctx, "GET", url, nil) if err != nil { err = fmt.Errorf("could not create new request: %s", err) return