Merge pull request 'Fix cmd flags and defer-before-error-check (#8, #19)' (#36) from fix/cmd-flags-and-defer-ordering into main

sites/aislegopher/aislegopher.go

@@ -51,10 +51,10 @@ func (c Config) GetItemFromURL(ctx context.Context, b extractor.Browser, u *url.
 	res.ID, _ = strconv.Atoi(a[3])
 
 	doc, err := b.Open(ctx, u.String(), extractor.OpenPageOptions{})
-	defer extractor.DeferClose(doc)
 	if err != nil {
 		return res, fmt.Errorf("failed to open page: %w", err)
 	}
+	defer extractor.DeferClose(doc)
 
 	names := doc.Select(".h4")
 

sites/archive/cmd/archive/main.go

@@ -56,7 +56,7 @@ func main() {
 	cli := &cli.Command{
 		Name:  "archive",
 		Usage: "Archive a website",
-		Flags: Flags,
+		Flags: flags,
 		Action: func(ctx context.Context, cli *cli.Command) error {
 
 			target := cli.Args().First()

sites/duckduckgo/cmd/duckduckgo/main.go

@@ -73,11 +73,10 @@ func main() {
 			}
 
 			b, err := browser.FromCommand(ctx, command)
-			defer extractor.DeferClose(b)
-
 			if err != nil {
 				return fmt.Errorf("failed to create browser: %w", err)
 			}
+			defer extractor.DeferClose(b)
 
 			search, err := c.OpenSearch(ctx, b, query)
 			if err != nil {

sites/duckduckgo/duckduckgo.go

@@ -90,11 +90,10 @@ func (c Config) Search(ctx context.Context, b extractor.Browser, query string) (
 
 	slog.Info("searching", "url", u, "query", query, "config", c, "browser", b)
 	doc, err := b.Open(ctx, u.String(), extractor.OpenPageOptions{})
-	defer extractor.DeferClose(doc)
-
 	if err != nil {
 		return nil, fmt.Errorf("failed to open url: %w", err)
 	}
+	defer extractor.DeferClose(doc)
 
 	var res []Result
 

sites/google/cmd/google/main.go

@@ -60,12 +60,10 @@ func main() {
 			}
 
 			b, err := browser.FromCommand(ctx, cli)
-
-			defer extractor.DeferClose(b)
-
 			if err != nil {
 				return err
 			}
+			defer extractor.DeferClose(b)
 
 			cfg := Flags.ToConfig(ctx, cli)
 

sites/wegmans/cmd/wegmans/main.go

@@ -38,11 +38,10 @@ func main() {
 			cfg := Flags.ToConfig(cmd)
 
 			b, err := browser.FromCommand(ctx, cmd)
-			defer extractor.DeferClose(b)
-
 			if err != nil {
 				return fmt.Errorf("error creating browser: %w", err)
 			}
+			defer extractor.DeferClose(b)
 			arg := cmd.Args().First()
 
 			if arg == "" {

sites/wegmans/wegmans.go

@@ -61,11 +61,10 @@ func (c Config) GetItemPrice(ctx context.Context, b extractor.Browser, u *url.UR
 	}
 
 	doc, err := b.Open(ctx, u.String(), extractor.OpenPageOptions{})
-	defer extractor.DeferClose(doc)
-
 	if err != nil {
 		return Item{}, err
 	}
+	defer extractor.DeferClose(doc)
 
 	timeout := 15 * time.Second
 	_ = doc.WaitForNetworkIdle(&timeout)