36b504609b
- settings: get filter choices from storage for settings validation - updater: update servers to the storage - storage: minimal deep copying and data duplication - storage: add merged servers mutex for thread safety - connection: filter servers in storage - formatter: format servers to Markdown in storage - PIA: get server by name from storage directly - Updater: get servers count from storage directly - Updater: equality check done in storage, fix #882
99 lines
2.7 KiB
Go
99 lines
2.7 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"flag"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/qdm12/gluetun/internal/configuration/settings"
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
"github.com/qdm12/gluetun/internal/constants/providers"
|
|
"github.com/qdm12/gluetun/internal/storage"
|
|
"github.com/qdm12/gluetun/internal/updater"
|
|
)
|
|
|
|
var (
|
|
ErrModeUnspecified = errors.New("at least one of -enduser or -maintainer must be specified")
|
|
ErrDNSAddress = errors.New("DNS address is not valid")
|
|
ErrNoProviderSpecified = errors.New("no provider was specified")
|
|
)
|
|
|
|
type Updater interface {
|
|
Update(ctx context.Context, args []string, logger UpdaterLogger) error
|
|
}
|
|
|
|
type UpdaterLogger interface {
|
|
Info(s string)
|
|
Warn(s string)
|
|
Error(s string)
|
|
}
|
|
|
|
func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) error {
|
|
options := settings.Updater{}
|
|
var endUserMode, maintainerMode, updateAll bool
|
|
var dnsAddress, csvProviders string
|
|
flagSet := flag.NewFlagSet("update", flag.ExitOnError)
|
|
flagSet.BoolVar(&endUserMode, "enduser", false, "Write results to /gluetun/servers.json (for end users)")
|
|
flagSet.BoolVar(&maintainerMode, "maintainer", false,
|
|
"Write results to ./internal/storage/servers.json to modify the program (for maintainers)")
|
|
flagSet.StringVar(&dnsAddress, "dns", "8.8.8.8", "DNS resolver address to use")
|
|
flagSet.BoolVar(&updateAll, "all", false, "Update servers for all VPN providers")
|
|
flagSet.StringVar(&csvProviders, "providers", "", "CSV string of VPN providers to update server data for")
|
|
if err := flagSet.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
if !endUserMode && !maintainerMode {
|
|
return ErrModeUnspecified
|
|
}
|
|
|
|
options.DNSAddress = net.ParseIP(dnsAddress)
|
|
if options.DNSAddress == nil {
|
|
return fmt.Errorf("%w: %s", ErrDNSAddress, dnsAddress)
|
|
}
|
|
|
|
if updateAll {
|
|
options.Providers = providers.All()
|
|
} else {
|
|
if csvProviders == "" {
|
|
return ErrNoProviderSpecified
|
|
}
|
|
options.Providers = strings.Split(csvProviders, ",")
|
|
}
|
|
|
|
options.SetDefaults(options.Providers[0])
|
|
|
|
err := options.Validate()
|
|
if err != nil {
|
|
return fmt.Errorf("options validation failed: %w", err)
|
|
}
|
|
|
|
const clientTimeout = 10 * time.Second
|
|
httpClient := &http.Client{Timeout: clientTimeout}
|
|
|
|
storage, err := storage.New(logger, constants.ServersData)
|
|
if err != nil {
|
|
return fmt.Errorf("cannot create servers storage: %w", err)
|
|
}
|
|
|
|
updater := updater.New(options, httpClient, storage, logger)
|
|
err = updater.UpdateServers(ctx)
|
|
if err != nil {
|
|
return fmt.Errorf("cannot update server information: %w", err)
|
|
}
|
|
|
|
if maintainerMode {
|
|
err := storage.FlushToFile(c.repoServersPath)
|
|
if err != nil {
|
|
return fmt.Errorf("cannot write servers data to embedded JSON file: %w", err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|