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

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

View File

@@ -19,13 +19,13 @@ var (
)
func GetServers(ctx context.Context, client *http.Client, minServers int) (
servers []models.NordvpnServer, warnings []string, err error) {
servers []models.Server, warnings []string, err error) {
data, err := fetchAPI(ctx, client)
if err != nil {
return nil, nil, err
}
servers = make([]models.NordvpnServer, 0, len(data))
servers = make([]models.Server, 0, len(data))
for _, jsonServer := range data {
if !jsonServer.Features.TCP && !jsonServer.Features.UDP {
@@ -44,7 +44,7 @@ func GetServers(ctx context.Context, client *http.Client, minServers int) (
return nil, nil, err
}
server := models.NordvpnServer{
server := models.Server{
Region: jsonServer.Country,
Hostname: jsonServer.Domain,
Number: number,

View File

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