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

chore(models): common Server & Servers for all providers (#943)

Browse Source
This commit is contained in:
Quentin McGaw
2022-04-16 22:25:36 +02:00
parent aa729515b9
commit 5d66c193aa
148 changed files with 27081 additions and 27795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/updater/providers/mullvad/hosttoserver.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/qdm12/gluetun/internal/models"
)
type hostToServer map[string]models.MullvadServer
type hostToServer map[string]models.Server
var (
ErrNoIP = errors.New("no IP address for VPN server")
@@ -73,8 +73,8 @@ func (hts hostToServer) add(data serverData) (err error) {
return nil
}
func (hts hostToServer) toServersSlice() (servers []models.MullvadServer) {
servers = make([]models.MullvadServer, 0, len(hts))
func (hts hostToServer) toServersSlice() (servers []models.Server) {
servers = make([]models.Server, 0, len(hts))
for _, server := range hts {
server.IPs = uniqueSortedIPs(server.IPs)
servers = append(servers, server)

2
internal/updater/providers/mullvad/servers.go
View File

@@ -14,7 +14,7 @@ import (
var ErrNotEnoughServers = errors.New("not enough servers found")
func GetServers(ctx context.Context, client *http.Client, minServers int) (
servers []models.MullvadServer, err error) {
servers []models.Server, err error) {
data, err := fetchAPI(ctx, client)
if err != nil {
return nil, err

2
internal/updater/providers/mullvad/sort.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/models"
)
func sortServers(servers []models.MullvadServer) {
func sortServers(servers []models.Server) {
sort.Slice(servers, func(i, j int) bool {
if servers[i].Country == servers[j].Country {
if servers[i].City == servers[j].City {