albert/ipinfo
1
0
Fork 0
mirror of https://github.com/skidoodle/ipinfo.git synced 2025-02-15 08:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pretty print json

Browse Source
This commit is contained in:
skidoodle
2025-02-09 18:33:08 +01:00
parent a36241f263
commit 624cfb2c40
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server.go
View File

@@ -73,7 +73,9 @@ func handler(w http.ResponseWriter, r *http.Request) {
} else { } else {
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
json.NewEncoder(w).Encode(map[string]string{"error": string(invalidIPBytes)}) encoder := json.NewEncoder(w)
encoder.SetIndent("", " ")
encoder.Encode(map[string]string{"error": string(invalidIPBytes)})
return return
} }
case 2: case 2:
@@ -83,13 +85,17 @@ func handler(w http.ResponseWriter, r *http.Request) {
} else { } else {
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
json.NewEncoder(w).Encode(map[string]string{"error": string(invalidFieldBytes)}) encoder := json.NewEncoder(w)
encoder.SetIndent("", " ")
encoder.Encode(map[string]string{"error": string(invalidFieldBytes)})
return return
} }
default: default:
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
json.NewEncoder(w).Encode(map[string]string{"error": string(invalidIPBytes)}) encoder := json.NewEncoder(w)
encoder.SetIndent("", " ")
encoder.Encode(map[string]string{"error": string(invalidIPBytes)})
return return
} }
@@ -103,7 +109,9 @@ func handler(w http.ResponseWriter, r *http.Request) {
// Check if the IP is a bogon IP // Check if the IP is a bogon IP
if isBogon(ip) { if isBogon(ip) {
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
json.NewEncoder(w).Encode(bogonDataStruct{IP: ip.String(), Bogon: true}) encoder := json.NewEncoder(w)
encoder.SetIndent("", " ")
encoder.Encode(bogonDataStruct{IP: ip.String(), Bogon: true})
return return
} }
@@ -118,13 +126,17 @@ func handler(w http.ResponseWriter, r *http.Request) {
if field != "" { if field != "" {
value := getField(data, field) value := getField(data, field)
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
json.NewEncoder(w).Encode(map[string]*string{field: value}) encoder := json.NewEncoder(w)
encoder.SetIndent("", " ")
encoder.Encode(map[string]*string{field: value})
return return
} }
// Default case: return full IP data // Default case: return full IP data
w.Header().Set("Content-Type", "application/json; charset=utf-8") w.Header().Set("Content-Type", "application/json; charset=utf-8")
json.NewEncoder(w).Encode(data) encoder := json.NewEncoder(w)
encoder.SetIndent("", " ")
encoder.Encode(data)
} }
var fieldMap = map[string]func(*dataStruct) *string{ var fieldMap = map[string]func(*dataStruct) *string{