7b7df2c6af
This PR starts to implement the refactoring described at https://github.com/ooni/probe/issues/1951. I originally wrote more patches than the ones in this PR, but overall they were not readable. Since I want to squash and merge, here's a reasonable subset of the original patches that will still be readable and understandable in the future.
37 lines
996 B
Go
37 lines
996 B
Go
package probeservices
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
type urlListResult struct {
|
|
Results []model.OOAPIURLInfo `json:"results"`
|
|
}
|
|
|
|
// FetchURLList fetches the list of URLs used by WebConnectivity. The config
|
|
// argument contains the optional settings. Returns the list of URLs, on success,
|
|
// or an explanatory error, in case of failure.
|
|
func (c Client) FetchURLList(ctx context.Context, config model.OOAPIURLListConfig) ([]model.OOAPIURLInfo, error) {
|
|
query := url.Values{}
|
|
if config.CountryCode != "" {
|
|
query.Set("country_code", config.CountryCode)
|
|
}
|
|
if config.Limit > 0 {
|
|
query.Set("limit", fmt.Sprintf("%d", config.Limit))
|
|
}
|
|
if len(config.Categories) > 0 {
|
|
query.Set("category_codes", strings.Join(config.Categories, ","))
|
|
}
|
|
var response urlListResult
|
|
err := c.APIClient.GetJSONWithQuery(ctx, "/api/v1/test-list/urls", query, &response)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return response.Results, nil
|
|
}
|