Merge remote-tracking branch 'origin/master' into feature-webapp

This commit is contained in:
2025-10-17 09:12:01 +07:00

View File

@@ -587,7 +587,7 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
val json: JsonNode = objectmapper.readTree(it.body()) val json: JsonNode = objectmapper.readTree(it.body())
val tag = json.get("tag").asText("") val tag = json.get("tag").asText("")
val languages = json.get("language").asText("").split(";") val languages = json.get("language").asText("").split(";")
println("Add Language Link, tag=$tag, languages=$languages") //println("Add Language Link, tag=$tag, languages=$languages")
if (ValidString(tag)){ if (ValidString(tag)){
if (languages.all { xx -> Language.entries.any { yy -> yy.name.equals(xx,true)} }){ if (languages.all { xx -> Language.entries.any { yy -> yy.name.equals(xx,true)} }){
if (!db.languageDB.List.any { ll -> ll.TAG.equals(tag,true) }) { if (!db.languageDB.List.any { ll -> ll.TAG.equals(tag,true) }) {
@@ -597,11 +597,11 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
it.result(objectmapper.writeValueAsString(resultMessage("OK"))) it.result(objectmapper.writeValueAsString(resultMessage("OK")))
} else { } else {
it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to add language link to database"))) it.status(500).result(objectmapper.writeValueAsString(resultMessage("Failed to add language link to database")))
println("Failed to add language link to database") //println("Failed to add language link to database")
} }
} else { } else {
it.status(400).result(objectmapper.writeValueAsString(resultMessage("TAG=$tag already exists"))) it.status(400).result(objectmapper.writeValueAsString(resultMessage("TAG=$tag already exists")))
println("TAG=$tag already exists") //println("TAG=$tag already exists")
} }
} else { } else {
it.status(400).result(objectmapper.writeValueAsString(resultMessage("Contains unsupported language"))) it.status(400).result(objectmapper.writeValueAsString(resultMessage("Contains unsupported language")))