danvics/endlessh-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24 from shizunge/offline

Browse source 
set location to unknown when city is not available.
This commit is contained in:
Shizun Ge 2022-07-10 22:47:53 -07:00 committed by GitHub
commit 55c96bb2c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
geoip.go
View file

@ -32,6 +32,27 @@ var (
maxMindDbFileName *string maxMindDbFileName *string
) )
func composeLocation(country string, region string, city string) string {
var locations []string
for _, s := range []string{country, region, city} {
if strings.TrimSpace(s) != "" {
locations = append(locations, s)
}
}
location := strings.Join(locations, ", ")
if location == "" {
return "Unknown"
}
return location
}
func composeCountry(country string) string {
if country == "" {
return "Unknown"
}
return country
}
type freegeoip struct { type freegeoip struct {
Ip string `json:"ip"` Ip string `json:"ip"`
CountryCode string `json:"country_code"` CountryCode string `json:"country_code"`
@ -64,21 +85,9 @@ func geohashAndLocationFromFreegeoip(address string) (string, string, string, er
return "s000", "Unknown", "Unknown", err return "s000", "Unknown", "Unknown", err
} }
var locations []string
for _, s := range []string{geo.CountryName, geo.RegionName, geo.City} {
if strings.TrimSpace(s) != "" {
locations = append(locations, s)
}
}
location := strings.Join(locations, ", ")
if location == "" {
location = "Unknown"
}
country := geo.CountryName
if country == "" {
country = "Unknown"
}
gh := geohash.EncodeAuto(geo.Latitude, geo.Longitude) gh := geohash.EncodeAuto(geo.Latitude, geo.Longitude)
country := composeCountry(geo.CountryName)
location := composeLocation(geo.CountryName, geo.RegionName, geo.City)
return gh, country, location, nil return gh, country, location, nil
} }
@ -119,21 +128,9 @@ func geohashAndLocationFromIpapi(address string) (string, string, string, error)
return "s000", "Unknown", "Unknown", fmt.Errorf("failed to query %v via ip-api: status: %v, message: %v", address, geo.Status, geo.Message) return "s000", "Unknown", "Unknown", fmt.Errorf("failed to query %v via ip-api: status: %v, message: %v", address, geo.Status, geo.Message)
} }
var locations []string
for _, s := range []string{geo.CountryName, geo.RegionName, geo.City} {
if strings.TrimSpace(s) != "" {
locations = append(locations, s)
}
}
location := strings.Join(locations, ", ")
if location == "" {
location = "Unknown"
}
country := geo.CountryName
if country == "" {
country = "Unknown"
}
gh := geohash.EncodeAuto(geo.Latitude, geo.Longitude) gh := geohash.EncodeAuto(geo.Latitude, geo.Longitude)
country := composeCountry(geo.CountryName)
location := composeLocation(geo.CountryName, geo.RegionName, geo.City)
return gh, country, location, nil return gh, country, location, nil
} }
@ -151,8 +148,9 @@ func geohashAndLocationFromMaxMindDb(address string) (string, string, string, er
return "s000", "Unknown", "Unknown", err return "s000", "Unknown", "Unknown", err
} }
gh := geohash.EncodeAuto(record.Location.Latitude, record.Location.Longitude) gh := geohash.EncodeAuto(record.Location.Latitude, record.Location.Longitude)
country := record.Country.Names["en"] country := composeCountry(record.Country.Names["en"])
location := record.City.Names["en"] location := composeLocation(record.Country.Names["en"], "", record.City.Names["en"])
return gh, country, location, nil return gh, country, location, nil
} }