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/pia/hosttoserver.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/models"
)
type nameToServer map[string]models.PIAServer
type nameToServer map[string]models.Server
func (nts nameToServer) add(name, hostname, region string,
tcp, udp, portForward bool, ip net.IP) (change bool) {
@@ -46,8 +46,8 @@ func (nts nameToServer) add(name, hostname, region string,
return change
}
func (nts nameToServer) toServersSlice() (servers []models.PIAServer) {
servers = make([]models.PIAServer, 0, len(nts))
func (nts nameToServer) toServersSlice() (servers []models.Server) {
servers = make([]models.Server, 0, len(nts))
for _, server := range nts {
servers = append(servers, server)
}

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

@@ -15,7 +15,7 @@ import (
var ErrNotEnoughServers = errors.New("not enough servers found")
func GetServers(ctx context.Context, client *http.Client, minServers int) (
servers []models.PIAServer, err error) {
servers []models.Server, err error) {
nts := make(nameToServer)
noChangeCounter := 0

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

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