admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(vpnsecure): associate "N / A" with no data for servers

Browse Source
This commit is contained in:
Quentin McGaw
2024-04-29 09:46:40 +00:00
parent a75d6bed55
commit 1b6164cb91
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/provider/vpnsecure/updater/website.go
View File

@@ -93,6 +93,7 @@ func parseHTMLGridItem(gridItem *html.Node) (
} }
host := findHost(gridItemDT) host := findHost(gridItemDT)
host = naToEmpty(host)
if host == "" { if host == "" {
return server, htmlutils.WrapWarning("host not found", gridItemDT) return server, htmlutils.WrapWarning("host not found", gridItemDT)
} }
@@ -110,18 +111,21 @@ func parseHTMLGridItem(gridItem *html.Node) (
} }
region := findSpanStrong(gridItemDD, "Region:") region := findSpanStrong(gridItemDD, "Region:")
region = naToEmpty(region)
if region == "" { if region == "" {
warning := fmt.Sprintf("region for host %s not found", host) warning := fmt.Sprintf("region for host %s not found", host)
return server, htmlutils.WrapWarning(warning, gridItemDD) return server, htmlutils.WrapWarning(warning, gridItemDD)
} }
city := findSpanStrong(gridItemDD, "City:") city := findSpanStrong(gridItemDD, "City:")
city = naToEmpty(city)
if city == "" { if city == "" {
warning := fmt.Sprintf("region for host %s not found", host) warning := fmt.Sprintf("region for host %s not found", host)
return server, htmlutils.WrapWarning(warning, gridItemDD) return server, htmlutils.WrapWarning(warning, gridItemDD)
} }
premiumString := findSpanStrong(gridItemDD, "Premium:") premiumString := findSpanStrong(gridItemDD, "Premium:")
premiumString = naToEmpty(premiumString)
if premiumString == "" { if premiumString == "" {
warning := fmt.Sprintf("premium for host %s not found", host) warning := fmt.Sprintf("premium for host %s not found", host)
return server, htmlutils.WrapWarning(warning, gridItemDD) return server, htmlutils.WrapWarning(warning, gridItemDD)
@@ -135,6 +139,13 @@ func parseHTMLGridItem(gridItem *html.Node) (
}, "" }, ""
} }
func naToEmpty(current string) (output string) {
if current == "N / A" {
return ""
}
return current
}
func findCountry(countryNode *html.Node) (country string) { func findCountry(countryNode *html.Node) (country string) {
for node := countryNode.FirstChild; node != nil; node = node.NextSibling { for node := countryNode.FirstChild; node != nil; node = node.NextSibling {
if node.Data != "a" { if node.Data != "a" {