support comments for JSON files

Author: SaintWish

cmd/app/app.go

@@ -158,7 +158,7 @@ func (a *App) loadIPList(path string) error {
 		return err
 	}
 
-	return a.List.IP.LoadFromJSON(file)
+	return a.List.IP.LoadFromJSON(utils.StandardJSON(file, file))
 }
 
 func (a *App) loadMapList(path string) error {
@@ -167,7 +167,7 @@ func (a *App) loadMapList(path string) error {
 		return err
 	}
 
-	return a.List.Map.LoadFromJSON(file)
+	return a.List.Map.LoadFromJSON(utils.StandardJSON(file, file))
 }
 
 func (a *App) loadSystemAdminList(path string) error {
@@ -176,7 +176,7 @@ func (a *App) loadSystemAdminList(path string) error {
 		return err
 	}
 
-	return a.List.SystemAdmin.LoadFromJSON(file)
+	return a.List.SystemAdmin.LoadFromJSON(utils.StandardJSON(file, file))
 }
 
 func (a *App) Start(mux chi.Router) error {

pkg/utils/utils.go

@@ -34,4 +34,78 @@ func Steam64To32(steamID int64) (steam32 string) {
 
 	steam32 = "STEAM_0-" + strconv.FormatInt(remainder, 10) + "-" + strconv.FormatInt(steamID, 10)
 	return
+}
+
+// Credit to https://github.com/tidwall/jsonc - MIT License https://github.com/tidwall/jsonc/blob/master/LICENSE
+func StandardJSON(src, dst []byte) []byte {
+	dst = dst[:0]
+
+	for i := 0; i < len(src); i++ {
+		if src[i] == '/' {
+			if i < len(src)-1 {
+				if src[i+1] == '/' {
+					dst = append(dst, ' ', ' ')
+					i += 2
+					for ; i < len(src); i++ {
+						if src[i] == '\n' {
+							dst = append(dst, '\n')
+							break
+						} else if src[i] == '\t' || src[i] == '\r' {
+							dst = append(dst, src[i])
+						} else {
+							dst = append(dst, ' ')
+						}
+					}
+					continue
+				}
+				if src[i+1] == '*' {
+					dst = append(dst, ' ', ' ')
+					i += 2
+					for ; i < len(src)-1; i++ {
+						if src[i] == '*' && src[i+1] == '/' {
+							dst = append(dst, ' ', ' ')
+							i++
+							break
+						} else if src[i] == '\n' || src[i] == '\t' ||
+							src[i] == '\r' {
+							dst = append(dst, src[i])
+						} else {
+							dst = append(dst, ' ')
+						}
+					}
+					continue
+				}
+			}
+		}
+		
+		dst = append(dst, src[i])
+		if src[i] == '"' {
+			for i = i + 1; i < len(src); i++ {
+				dst = append(dst, src[i])
+				if src[i] == '"' {
+					j := i - 1
+					for ; ; j-- {
+						if src[j] != '\\' {
+							break
+						}
+					}
+					if (j-i)%2 != 0 {
+						break
+					}
+				}
+			}
+		} else if src[i] == '}' || src[i] == ']' {
+			for j := len(dst) - 2; j >= 0; j-- {
+				if dst[j] <= ' ' {
+					continue
+				}
+				if dst[j] == ',' {
+					dst[j] = ' '
+				}
+				break
+			}
+		}
+	}
+
+	return dst
 }