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

@@ -6,7 +6,7 @@ import (
"github.com/qdm12/gluetun/internal/models"
)
type cityToServer map[string]models.PerfectprivacyServer
type cityToServer map[string]models.Server
func (cts cityToServer) add(city string, ips []net.IP) {
server, ok := cts[city]
@@ -36,8 +36,8 @@ func (cts cityToServer) add(city string, ips []net.IP) {
cts[city] = server
}
func (cts cityToServer) toServersSlice() (servers []models.PerfectprivacyServer) {
servers = make([]models.PerfectprivacyServer, 0, len(cts))
func (cts cityToServer) toServersSlice() (servers []models.Server) {
servers = make([]models.Server, 0, len(cts))
for _, server := range cts {
servers = append(servers, server)
}

View File

@@ -15,7 +15,7 @@ import (
var ErrNotEnoughServers = errors.New("not enough servers found")
func GetServers(ctx context.Context, unzipper unzip.Unzipper, minServers int) (
servers []models.PerfectprivacyServer, warnings []string, err error) {
servers []models.Server, warnings []string, err error) {
zipURL := url.URL{
Scheme: "https",
Host: "www.perfect-privacy.com",

View File

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