- Each provider interface can now fetch updated servers data - Rename each provider updater subpackage name to `updater` - Updater constructor does not take a settings struct - Updater update method takes in a slice of provider strings
48 lines
994 B
Go
48 lines
994 B
Go
package updater
|
|
|
|
import (
|
|
"net"
|
|
|
|
"github.com/qdm12/gluetun/internal/constants/vpn"
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
)
|
|
|
|
type cityToServer map[string]models.Server
|
|
|
|
func (cts cityToServer) add(city string, ips []net.IP) {
|
|
server, ok := cts[city]
|
|
if !ok {
|
|
server.VPN = vpn.OpenVPN
|
|
server.City = city
|
|
server.IPs = ips
|
|
server.TCP = true
|
|
server.UDP = true
|
|
} else {
|
|
// Do not insert duplicate IP addresses
|
|
existingIPs := make(map[string]struct{}, len(server.IPs))
|
|
for _, ip := range server.IPs {
|
|
existingIPs[ip.String()] = struct{}{}
|
|
}
|
|
|
|
for _, ip := range ips {
|
|
ipString := ip.String()
|
|
_, ok := existingIPs[ipString]
|
|
if ok {
|
|
continue
|
|
}
|
|
existingIPs[ipString] = struct{}{}
|
|
server.IPs = append(server.IPs, ip)
|
|
}
|
|
}
|
|
|
|
cts[city] = server
|
|
}
|
|
|
|
func (cts cityToServer) toServersSlice() (servers []models.Server) {
|
|
servers = make([]models.Server, 0, len(cts))
|
|
for _, server := range cts {
|
|
servers = append(servers, server)
|
|
}
|
|
return servers
|
|
}
|