From 2205fb398778814ade73fd5e748beab148ec77c1 Mon Sep 17 00:00:00 2001 From: feederbox826 Date: Wed, 29 Apr 2026 18:10:25 -0400 Subject: [PATCH] use switch case, move defers up --- pkg/scraper/url.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkg/scraper/url.go b/pkg/scraper/url.go index 26a7b617e..9d95a69a6 100644 --- a/pkg/scraper/url.go +++ b/pkg/scraper/url.go @@ -30,11 +30,10 @@ const scrapeDefaultSleep = time.Second * 2 func loadURL(ctx context.Context, loadURL string, client *http.Client, def Definition, globalConfig GlobalConfig) (io.Reader, error) { driverOptions := def.DriverOptions if driverOptions != nil { - if driverOptions.UseCDP { - // get the page using chrome dp + switch { + case driverOptions.UseCDP: return urlFromCDP(ctx, loadURL, *driverOptions, globalConfig) - } else if driverOptions.UseSurf { - // get the page using surf + case driverOptions.UseSurf: return urlFromSurf(ctx, loadURL, def, globalConfig) } } @@ -78,12 +77,11 @@ func loadURL(ctx context.Context, loadURL string, client *http.Client, def Defin if err != nil { return nil, err } + defer resp.Body.Close() if resp.StatusCode >= 400 { return nil, fmt.Errorf("http error %d:%s", resp.StatusCode, http.StatusText(resp.StatusCode)) } - defer resp.Body.Close() - body, err := io.ReadAll(resp.Body) if err != nil { return nil, err @@ -131,13 +129,11 @@ func urlFromSurf(ctx context.Context, loadURL string, def Definition, globalConf if err != nil { return nil, err } - + defer resp.Body.Close() if resp.StatusCode >= 400 { return nil, fmt.Errorf("http error %d:%s", resp.StatusCode, http.StatusText(resp.StatusCode)) } - defer resp.Body.Close() - body, err := io.ReadAll(resp.Body) if err != nil { return nil, err