mirror of
https://github.com/qdm12/gluetun.git
synced 2026-07-30 17:03:22 +02:00
d9cc7dcffb
- new directory structure containing manifest.json and one json file per provider, by default. - the manifest.json file can specify a filepath for each vpn provider - each vpn provider json data file can contain the `"preferred": true` field to enforce it is used even if outdated, unless there is a version mismatch - `STORAGE_SERVERS_DIRECTORY_PATH` replaces `STORAGE_FILEPATH` (which is now a migration source only). It sets the directory where server manifest and per-provider JSON files are stored (default: `/gluetun/servers/`). - First-run migration: On startup, gluetun checks for the old /gluetun/servers.json file; if found and no new manifest exists, it automatically migrates all data to /gluetun/servers/ directory structure - Silent fallback: If legacy file isn't found, uses the new directory path normally - Legacy cleanup: After successful migration, attempts to remove the old fat JSON file (logs warning only if removal fails, e.g., read-only bind mounts)
152 lines
3.1 KiB
Go
152 lines
3.1 KiB
Go
package validation
|
|
|
|
import (
|
|
"sort"
|
|
|
|
"github.com/qdm12/gluetun-servers/pkg/models"
|
|
)
|
|
|
|
func sortedInsert(ss []string, s string) []string {
|
|
i := sort.SearchStrings(ss, s)
|
|
ss = append(ss, "")
|
|
copy(ss[i+1:], ss[i:])
|
|
ss[i] = s
|
|
return ss
|
|
}
|
|
|
|
func ExtractCountries(servers []models.Server) (values []string) {
|
|
seen := make(map[string]struct{}, len(servers))
|
|
values = make([]string, 0, len(servers))
|
|
for _, server := range servers {
|
|
value := server.Country
|
|
if value == "" {
|
|
continue
|
|
}
|
|
_, alreadySeen := seen[value]
|
|
if alreadySeen {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
|
|
values = sortedInsert(values, value)
|
|
}
|
|
return values
|
|
}
|
|
|
|
func ExtractCategories(servers []models.Server) (values []string) {
|
|
seen := make(map[string]struct{}, len(servers))
|
|
values = make([]string, 0, len(servers))
|
|
for _, server := range servers {
|
|
categories := server.Categories
|
|
if len(categories) == 0 {
|
|
continue
|
|
}
|
|
|
|
for _, value := range categories {
|
|
_, alreadySeen := seen[value]
|
|
if alreadySeen {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
|
|
values = sortedInsert(values, value)
|
|
}
|
|
}
|
|
return values
|
|
}
|
|
|
|
func ExtractRegions(servers []models.Server) (values []string) {
|
|
seen := make(map[string]struct{}, len(servers))
|
|
values = make([]string, 0, len(servers))
|
|
for _, server := range servers {
|
|
value := server.Region
|
|
if value == "" {
|
|
continue
|
|
}
|
|
_, alreadySeen := seen[value]
|
|
if alreadySeen {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
|
|
values = sortedInsert(values, value)
|
|
}
|
|
return values
|
|
}
|
|
|
|
func ExtractCities(servers []models.Server) (values []string) {
|
|
seen := make(map[string]struct{}, len(servers))
|
|
values = make([]string, 0, len(servers))
|
|
for _, server := range servers {
|
|
value := server.City
|
|
if value == "" {
|
|
continue
|
|
}
|
|
_, alreadySeen := seen[value]
|
|
if alreadySeen {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
|
|
values = sortedInsert(values, value)
|
|
}
|
|
return values
|
|
}
|
|
|
|
func ExtractISPs(servers []models.Server) (values []string) {
|
|
seen := make(map[string]struct{}, len(servers))
|
|
values = make([]string, 0, len(servers))
|
|
for _, server := range servers {
|
|
value := server.ISP
|
|
if value == "" {
|
|
continue
|
|
}
|
|
_, alreadySeen := seen[value]
|
|
if alreadySeen {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
|
|
values = sortedInsert(values, value)
|
|
}
|
|
return values
|
|
}
|
|
|
|
func ExtractServerNames(servers []models.Server) (values []string) {
|
|
seen := make(map[string]struct{}, len(servers))
|
|
values = make([]string, 0, len(servers))
|
|
for _, server := range servers {
|
|
value := server.ServerName
|
|
if value == "" {
|
|
continue
|
|
}
|
|
_, alreadySeen := seen[value]
|
|
if alreadySeen {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
|
|
values = sortedInsert(values, value)
|
|
}
|
|
return values
|
|
}
|
|
|
|
func ExtractHostnames(servers []models.Server) (values []string) {
|
|
seen := make(map[string]struct{}, len(servers))
|
|
values = make([]string, 0, len(servers))
|
|
for _, server := range servers {
|
|
value := server.Hostname
|
|
if value == "" {
|
|
continue
|
|
}
|
|
_, alreadySeen := seen[value]
|
|
if alreadySeen {
|
|
continue
|
|
}
|
|
seen[value] = struct{}{}
|
|
|
|
values = sortedInsert(values, value)
|
|
}
|
|
return values
|
|
}
|