chore(updater): incorporate FetchServers method in Provider interface

- Each provider interface can now fetch updated servers data
- Rename each provider updater subpackage name to `updater`
- Updater constructor does not take a settings struct
- Updater update method takes in a slice of provider strings
This commit is contained in:
Quentin McGaw
2022-06-09 23:47:12 +00:00
parent 11b55abff3
commit ebd94723c1
148 changed files with 374 additions and 281 deletions

View File

@@ -8,15 +8,13 @@ import (
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider"
"github.com/qdm12/gluetun/internal/updater/unzip"
"golang.org/x/text/cases"
"golang.org/x/text/language"
)
type Updater struct {
// configuration
options settings.Updater
// state
storage Storage
@@ -31,6 +29,9 @@ type Storage interface {
SetServers(provider string, servers []models.Server) (err error)
GetServersCount(provider string) (count int)
ServersAreEqual(provider string, servers []models.Server) (equal bool)
// Extra methods to match the provider.New storage interface
FilterServers(provider string, selection settings.ServerSelection) (filtered []models.Server, err error)
GetServerByName(provider string, name string) (server models.Server, ok bool)
}
type Logger interface {
@@ -39,11 +40,10 @@ type Logger interface {
Error(s string)
}
func New(settings settings.Updater, httpClient *http.Client,
func New(httpClient *http.Client,
storage Storage, logger Logger) *Updater {
unzipper := unzip.New(httpClient)
return &Updater{
options: settings,
storage: storage,
logger: logger,
timeNow: time.Now,
@@ -52,19 +52,23 @@ func New(settings settings.Updater, httpClient *http.Client,
}
}
func (u *Updater) UpdateServers(ctx context.Context) (err error) {
func (u *Updater) UpdateServers(ctx context.Context, providers []string) (err error) {
caser := cases.Title(language.English)
for _, provider := range u.options.Providers {
u.logger.Info("updating " + caser.String(provider) + " servers...")
for _, providerName := range providers {
u.logger.Info("updating " + caser.String(providerName) + " servers...")
fetcherStorage := (Storage)(nil) // unused
fetcher := provider.New(providerName, fetcherStorage, u.timeNow,
u.logger, u.client, u.unzipper)
// TODO support servers offering only TCP or only UDP
// for NordVPN and PureVPN
err := u.updateProvider(ctx, provider)
err := u.updateProvider(ctx, fetcher)
if err == nil {
continue
}
// return the only error for the single provider.
if len(u.options.Providers) == 1 {
if len(providers) == 1 {
return err
}