admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(filter): common filter for all providers

Browse Source
This commit is contained in:
Quentin McGaw
2022-04-18 17:06:57 +00:00
parent ac9571c6b2
commit f5c00c3e2d
54 changed files with 435 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/provider/protonvpn/connection.go
View File

@@ -19,7 +19,7 @@ func (p *Protonvpn) GetConnection(selection settings.ServerSelection) (
return connection, err
}
servers, err := p.filterServers(selection)
servers, err := utils.FilterServers(p.servers, selection)
if err != nil {
return connection, err
}

32
internal/provider/protonvpn/filter.go
View File

@@ -1,32 +0,0 @@
package protonvpn
import (
"strings"
"github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/provider/utils"
)
func (p *Protonvpn) filterServers(selection settings.ServerSelection) (
servers []models.Server, err error) {
for _, server := range p.servers {
switch {
case
utils.FilterByPossibilities(server.Country, selection.Countries),
utils.FilterByPossibilities(server.Region, selection.Regions),
utils.FilterByPossibilities(server.City, selection.Cities),
utils.FilterByPossibilities(server.Hostname, selection.Hostnames),
utils.FilterByPossibilities(server.ServerName, selection.Names), // TODO remove in v4
*selection.FreeOnly && !strings.Contains(strings.ToLower(server.ServerName), "free"):
default:
servers = append(servers, server)
}
}
if len(servers) == 0 {
return nil, utils.NoServerFoundError(selection)
}
return servers, nil
}