mirrors
/
Xray-core
mirror of https://github.com/XTLS/Xray-core.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Recognize .jsonc files automatically (#2398) 

Closes https://github.com/XTLS/Xray-core/issues/2399
This commit is contained in:
冬花ice 2023-08-06 14:47:31 +08:00 committed by GitHub
parent ce89b5d7de
commit 017b56adf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.go
View File

@ -57,7 +57,7 @@ func GetFormatByExtension(ext string) string {
return "yaml" return "yaml"
case "toml": case "toml":
return "toml" return "toml"
case "json": case "json", "jsonc":
return "json" return "json"
default: default:
return "" return ""

4
main/run.go
View File

@ -113,13 +113,13 @@ func dirExists(file string) bool {
func getRegepxByFormat() string { func getRegepxByFormat() string {
switch strings.ToLower(*format) { switch strings.ToLower(*format) {
case "json": case "json":
return `^.+\.json$` return `^.+\.(json|jsonc)$`
case "toml": case "toml":
return `^.+\.toml$` return `^.+\.toml$`
case "yaml", "yml": case "yaml", "yml":
return `^.+\.(yaml|yml)$` return `^.+\.(yaml|yml)$`
default: default:
return `^.+\.(json|toml|yaml|yml)$` return `^.+\.(json|jsonc|toml|yaml|yml)$`
} }
} }