refactor: restructure API, deduplicate code, expand test coverage
Some checks failed
CI / build (push) Failing after 2m4s
CI / test (push) Failing after 2m6s
CI / vet (push) Failing after 2m19s

- Extract shared DeferClose helper, removing 14 duplicate copies
- Rename PlayWright-prefixed types to cleaner names (BrowserOptions,
  BrowserSelection, NewBrowser, etc.)
- Rename fields: ServerAddress, RequireServer (was DontLaunchOnConnectFailure)
- Extract shared initBrowser/mergeOptions into browser_init.go,
  deduplicating ~120 lines between NewBrowser and NewInteractiveBrowser
- Remove unused locator field from document struct
- Add tests for all previously untested packages (archive, aislegopher,
  wegmans, useragents, powerball) and expand existing test suites
- Add MIGRATION.md documenting all breaking API changes

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-09 13:59:47 -05:00
parent e7b7e78796
commit cb2ed10cfd
32 changed files with 667 additions and 417 deletions

View File

@@ -3,12 +3,13 @@ package main
import (
"context"
"fmt"
"github.com/urfave/cli/v3"
"io"
"os"
"strings"
"time"
"github.com/urfave/cli/v3"
"gitea.stevedudenhoeffer.com/steve/go-extractor"
"gitea.stevedudenhoeffer.com/steve/go-extractor/cmd/browser/pkg/browser"
"gitea.stevedudenhoeffer.com/steve/go-extractor/sites/duckduckgo"
)
@@ -49,12 +50,6 @@ func (f DuckDuckGoFlags) ToConfig(cmd *cli.Command) (duckduckgo.Config, error) {
return res, nil
}
func deferClose(cl io.Closer) {
if cl != nil {
_ = cl.Close()
}
}
func main() {
var flags []cli.Flag
@@ -78,7 +73,7 @@ func main() {
}
b, err := browser.FromCommand(ctx, command)
defer deferClose(b)
defer extractor.DeferClose(b)
if err != nil {
return fmt.Errorf("failed to create browser: %w", err)
@@ -89,7 +84,7 @@ func main() {
return fmt.Errorf("failed to open search: %w", err)
}
defer deferClose(search)
defer extractor.DeferClose(search)
res := search.GetResults()
fmt.Println("Results:", res)

View File

@@ -3,7 +3,6 @@ package duckduckgo
import (
"context"
"fmt"
"io"
"log/slog"
"net/url"
@@ -71,12 +70,6 @@ type Result struct {
Description string
}
func deferClose(cl io.Closer) {
if cl != nil {
_ = cl.Close()
}
}
func (c Config) OpenSearch(ctx context.Context, b extractor.Browser, query string) (SearchPage, error) {
u := c.ToSearchURL(query)
@@ -97,7 +90,7 @@ 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 deferClose(doc)
defer extractor.DeferClose(doc)
if err != nil {
return nil, fmt.Errorf("failed to open url: %w", err)

View File

@@ -83,3 +83,34 @@ func TestConfig_ToSearchURL_NoRegion(t *testing.T) {
t.Errorf("kl should be empty when no region, got %q", u.Query().Get("kl"))
}
}
func TestConfig_ToSearchURL_Scheme(t *testing.T) {
c := Config{SafeSearch: SafeSearchOff}
u := c.ToSearchURL("test")
if u.Scheme != "https" {
t.Errorf("Scheme = %q, want %q", u.Scheme, "https")
}
}
func TestConfig_ToSearchURL_SpecialChars(t *testing.T) {
c := Config{SafeSearch: SafeSearchOff}
u := c.ToSearchURL("go lang & testing")
if u.Query().Get("q") != "go lang & testing" {
t.Errorf("q = %q, want %q", u.Query().Get("q"), "go lang & testing")
}
}
func TestResult_ZeroValue(t *testing.T) {
var r Result
if r.URL != "" || r.Title != "" || r.Description != "" {
t.Error("zero-value Result should have empty fields")
}
}
func TestDefaultConfig_SafeSearch(t *testing.T) {
if DefaultConfig.SafeSearch != SafeSearchOff {
t.Errorf("DefaultConfig.SafeSearch = %d, want %d", DefaultConfig.SafeSearch, SafeSearchOff)
}
}