- 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
61 lines
1.2 KiB
Go
61 lines
1.2 KiB
Go
package updater
|
|
|
|
import (
|
|
"net"
|
|
"sort"
|
|
|
|
"github.com/qdm12/gluetun/internal/constants/vpn"
|
|
"github.com/qdm12/gluetun/internal/models"
|
|
)
|
|
|
|
type hostToServer map[string]models.Server
|
|
|
|
func (hts hostToServer) add(host, country, city string, tcp, udp bool) {
|
|
server, ok := hts[host]
|
|
if !ok {
|
|
server.VPN = vpn.OpenVPN
|
|
server.Hostname = host
|
|
server.Country = country
|
|
server.City = city
|
|
}
|
|
if tcp {
|
|
server.TCP = tcp
|
|
}
|
|
if udp {
|
|
server.UDP = udp
|
|
}
|
|
hts[host] = server
|
|
}
|
|
|
|
func (hts hostToServer) toHostsSlice() (hosts []string) {
|
|
hosts = make([]string, 0, len(hts))
|
|
for host := range hts {
|
|
hosts = append(hosts, host)
|
|
}
|
|
sort.Slice(hosts, func(i, j int) bool {
|
|
return hosts[i] < hosts[j]
|
|
})
|
|
return hosts
|
|
}
|
|
|
|
func (hts hostToServer) adaptWithIPs(hostToIPs map[string][]net.IP) {
|
|
for host, IPs := range hostToIPs {
|
|
server := hts[host]
|
|
server.IPs = IPs
|
|
hts[host] = server
|
|
}
|
|
for host, server := range hts {
|
|
if len(server.IPs) == 0 {
|
|
delete(hts, host)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (hts hostToServer) toServersSlice() (servers []models.Server) {
|
|
servers = make([]models.Server, 0, len(hts))
|
|
for _, server := range hts {
|
|
servers = append(servers, server)
|
|
}
|
|
return servers
|
|
}
|