1
0
Fork 0

languages are now validated in parallel for much faster building time

This commit is contained in:
sspanak 2024-01-02 18:30:01 +02:00
parent 7cde9ecd00
commit f91edd8878

View file

@ -1,21 +1,3 @@
static def validateDictionaryLine(String line, int lineNumber) {
if (line == "") {
return "There is no word on line ${lineNumber}. Remove all empty lines."
} else if (line.contains(" ")) {
return "Found space on line ${lineNumber}. Make sure each word is on a new line. Phrases are not allowed."
}
return ''
}
static def extractAlphabetCharsFromLine(String line) {
if (line.contains('PUNCTUATION') || line.contains('SPECIAL') || !line.matches('\\s+- \\[.+?\\].*')) {
return ''
}
return line.replaceFirst('^\\s+- \\[', '').replaceFirst('\\].*', '').replace(',', '').replace(' ', '')
}
static def validateDictionaryWord(String word, int lineNumber, String validCharacters, String errorMsgPrefix) { static def validateDictionaryWord(String word, int lineNumber, String validCharacters, String errorMsgPrefix) {
int errorCount = 0 int errorCount = 0
def errors = '' def errors = ''
@ -43,31 +25,39 @@ static def validateDictionaryWord(String word, int lineNumber, String validChara
return [errorCount, errors] return [errorCount, errors]
} }
ext.validateLanguageFiles = { definitionsDir, dictionariesDir, outputFile ->
final GEOGRAPHICAL_NAME = ~"[A-Z]\\w+-[^\\n]+"
String errors = "" static def validateDictionaryLine(String line, int lineNumber) {
int errorCount = 0 if (line == "") {
return "There is no word on line ${lineNumber}. Remove all empty lines."
outputFile.text = "" } else if (line.contains(" ")) {
return "Found space on line ${lineNumber}. Make sure each word is on a new line. Phrases are not allowed."
fileTree(definitionsDir).getFiles().each { File languageFile ->
if (errorCount >= MAX_ERRORS) {
return
} }
println "Validating language: ${languageFile.name}" return ''
}
boolean isFileValid = true
static def extractAlphabetCharsFromLine(String line) {
if (line.contains('PUNCTUATION') || line.contains('SPECIAL') || !line.matches('\\s+- \\[.+?\\].*')) {
return ''
}
return line.replaceFirst('^\\s+- \\[', '').replaceFirst('\\].*', '').replace(',', '').replace(' ', '')
}
static def parseLanguageFile(File languageFile, String dictionariesDir) {
String alphabet = languageFile.name.contains("Hebrew") ? '"' : ''
File dictionaryFile
int errorCount = 0
String errorMsg = ""
boolean hasLayout = false boolean hasLayout = false
boolean isLocaleValid = false boolean isLocaleValid = false
String localeString = '' String localeString = ""
String dictionaryFileName = '' String dictionaryFileName = ""
String alphabet = languageFile.name.contains("Hebrew") ? '"' : '' for (String line : languageFile.readLines()) {
languageFile.eachLine { line ->
if ( if (
line.matches("^[a-zA-Z].*") line.matches("^[a-zA-Z].*")
&& !line.startsWith("abcString") && !line.startsWith("abcString")
@ -77,19 +67,17 @@ ext.validateLanguageFiles = { definitionsDir, dictionariesDir, outputFile ->
&& !line.startsWith("locale") && !line.startsWith("locale")
&& !line.startsWith("name") && !line.startsWith("name")
) { ) {
isFileValid = false
def parts = line.split(":") def parts = line.split(":")
def property = parts.length > 0 ? parts[0] : line def property = parts.length > 0 ? parts[0] : line
errorCount++ errorCount++
errors += "Language '${languageFile.name}' is invalid. Found unknown property: '${property}'.\n" errorMsg += "Language '${languageFile.name}' is invalid. Found unknown property: '${property}'.\n"
} }
if (line.startsWith("hasUpperCase") && !line.endsWith("yes") && !line.endsWith("no")) { if (line.startsWith("hasUpperCase") && !line.endsWith("yes") && !line.endsWith("no")) {
def invalidVal = line.replace("hasUpperCase:", "").trim() def invalidVal = line.replace("hasUpperCase:", "").trim()
isFileValid = false
errorCount++ errorCount++
errors += "Language '${languageFile.name}' is invalid. Unrecognized 'hasUpperCase' value: '${invalidVal}'. Only 'yes' and 'no' are allowed.\n" errorMsg += "Language '${languageFile.name}' is invalid. Unrecognized 'hasUpperCase' value: '${invalidVal}'. Only 'yes' and 'no' are allowed.\n"
} }
if (line.startsWith("layout")) { if (line.startsWith("layout")) {
@ -110,50 +98,49 @@ ext.validateLanguageFiles = { definitionsDir, dictionariesDir, outputFile ->
} }
if (!hasLayout) { if (!hasLayout) {
isFileValid = false
errorCount++ errorCount++
errors += "Language '${languageFile.name}' is invalid. Missing 'layout' property.\n" errorMsg += "Language '${languageFile.name}' is invalid. Missing 'layout' property.\n"
} }
if (alphabet.isEmpty()) { if (alphabet.isEmpty()) {
isFileValid = false
errorCount++ errorCount++
errors += "Language '${languageFile.name}' is invalid. No language characters found. Make sure 'layout' contains series of characters per each key in the format: ' - [a, b, c]' and so on\n" errorMsg += "Language '${languageFile.name}' is invalid. No language characters found. Make sure 'layout' contains series of characters per each key in the format: ' - [a, b, c]' and so on\n"
} }
if (!isLocaleValid) { if (!isLocaleValid) {
isFileValid = false
errorCount++ errorCount++
def msg = localeString.isEmpty() ? "Missing 'locale' property." : "Unrecognized locale format: '${localeString}'" def msg = localeString.isEmpty() ? "Missing 'locale' property." : "Unrecognized locale format: '${localeString}'"
errors += "Language '${languageFile.name}' is invalid. ${msg}\n" errorMsg += "Language '${languageFile.name}' is invalid. ${msg}\n"
} }
def dictionaryFile = new File("$dictionariesDir/${dictionaryFileName}") dictionaryFile = new File("$dictionariesDir/${dictionaryFileName}")
if (dictionaryFileName.isEmpty() || !dictionaryFile.exists()) { if (dictionaryFileName.isEmpty() || !dictionaryFile.exists()) {
errorCount++ errorCount++
errors += "Could not find dictionary file: '${dictionaryFileName}' in: '${dictionariesDir}'. Make sure 'dictionaryFile' is set correctly in: '${languageFile.name}'.\n" errorMsg += "Could not find dictionary file: '${dictionaryFileName}' in: '${dictionariesDir}'. Make sure 'dictionaryFile' is set correctly in: '${languageFile.name}'.\n"
outputFile.text += "${languageFile.name} INVALID \n"
return
} }
def validChars = alphabet.toUpperCase() == alphabet ? "^[${alphabet}\\-']+\$" : "^[${alphabet}${alphabet.toUpperCase()}\\-']+\$" return [alphabet, dictionaryFile, errorCount, errorMsg]
}
static def parseDictionaryFile(String alphabet, File dictionaryFile, int MAX_ERRORS, String CSV_DELIMITER, int MAX_WORD_FREQUENCY) {
final GEOGRAPHICAL_NAME = ~"[A-Z]\\w+-[^\\n]+"
final VALID_CHARS = alphabet.toUpperCase() == alphabet ? "^[${alphabet}\\-']+\$" : "^[${alphabet}${alphabet.toUpperCase()}\\-']+\$"
def uniqueWords = [:] def uniqueWords = [:]
int lineNumber = 0
dictionaryFile.eachLine {line -> int errorCount = 0
if (errorCount >= MAX_ERRORS) { String errorMsg = ""
return
}
lineNumber++ def fileContents = dictionaryFile.readLines()
for (int lineNumber = 0; lineNumber < fileContents.size() && errorCount < MAX_ERRORS; lineNumber++) {
String line = fileContents.get(lineNumber)
String error = validateDictionaryLine(line, lineNumber) String error = validateDictionaryLine(line, lineNumber)
if (!error.isEmpty()) { if (!error.isEmpty()) {
isFileValid = false
errorCount++ errorCount++
errors += "Dictionary '${dictionaryFile.name}' is invalid. ${error}.\n" errorMsg += "Dictionary '${dictionaryFile.name}' is invalid. ${error}.\n"
return break
} }
String[] parts = line.split(CSV_DELIMITER, 2) String[] parts = line.split(CSV_DELIMITER, 2)
@ -161,34 +148,57 @@ ext.validateLanguageFiles = { definitionsDir, dictionariesDir, outputFile ->
final frequency = (parts.length > 1 ? parts[1] : "0") as int final frequency = (parts.length > 1 ? parts[1] : "0") as int
if (frequency < 0 || frequency > MAX_WORD_FREQUENCY) { if (frequency < 0 || frequency > MAX_WORD_FREQUENCY) {
isFileValid = false
errorCount++ errorCount++
errors += "Dictionary '${dictionaryFile.name}' is invalid. Found out-of-range word frequency: '${frequency}' on line ${lineNumber}. Frequency must be an integer between 0 and ${MAX_WORD_FREQUENCY}.\n" errorMsg += "Dictionary '${dictionaryFile.name}' is invalid. Found out-of-range word frequency: '${frequency}' on line ${lineNumber}. Frequency must be an integer between 0 and ${MAX_WORD_FREQUENCY}.\n"
} }
def (wordErrorCount, wordErrors) = validateDictionaryWord(word, lineNumber, validChars, "Dictionary '${dictionaryFile.name}' is invalid") def (wordErrorCount, wordErrors) = validateDictionaryWord(word, lineNumber, VALID_CHARS, "Dictionary '${dictionaryFile.name}' is invalid")
isFileValid = wordErrorCount > 0 ? false : isFileValid
errorCount += wordErrorCount errorCount += wordErrorCount
errors += wordErrors errorMsg += wordErrors
String uniqueWordKey = word ==~ GEOGRAPHICAL_NAME ? word : word.toLowerCase() String uniqueWordKey = word ==~ GEOGRAPHICAL_NAME ? word : word.toLowerCase()
if (uniqueWords[uniqueWordKey] != null && uniqueWords[uniqueWordKey] == true) { if (uniqueWords[uniqueWordKey] != null && uniqueWords[uniqueWordKey] == true) {
isFileValid = false
errorCount++ errorCount++
errors += "Dictionary '${dictionaryFile.name}' is invalid. Found a repeating word: '${word}' on line ${lineNumber}. Ensure all words appear only once.\n" errorMsg += "Dictionary '${dictionaryFile.name}' is invalid. Found a repeating word: '${word}' on line ${lineNumber}. Ensure all words appear only once.\n"
} else { } else {
uniqueWords[uniqueWordKey] = true uniqueWords[uniqueWordKey] = true
} }
}
return [errorMsg, errorCount]
}
ext.validateLanguageFiles = { definitionsDir, dictionariesDir, outputFile ->
int errorCount = 0
outputFile.text = ""
def errorStream = fileTree(definitionsDir).getFiles().parallelStream().map { File languageFile ->
if (errorCount >= MAX_ERRORS) { if (errorCount >= MAX_ERRORS) {
errors += "Too many errors! Aborting.\n" return "Too many errors! Skipping: ${languageFile}\n"
}
} }
outputFile.text += "${languageFile.name} ${isFileValid ? 'OK' : 'INVALID'}\n" def (alphabet, dictionaryFile, langFileErrorCount, langFileErrorMsg) = parseLanguageFile(languageFile, dictionariesDir)
errorCount += langFileErrorCount
if (!langFileErrorMsg.isEmpty()) {
outputFile.text += "${languageFile.name} INVALID \n"
return langFileErrorMsg
} }
if (errors != "") { def (dictionaryErrorMsg, dictionaryErrorCount) = parseDictionaryFile(alphabet, dictionaryFile, MAX_ERRORS, CSV_DELIMITER, MAX_WORD_FREQUENCY)
throw new GradleException(errors) errorCount += dictionaryErrorCount
if (!dictionaryErrorMsg.isEmpty()) {
outputFile.text += "${languageFile.name} INVALID \n"
return dictionaryErrorMsg
}
outputFile.text += "${languageFile.name} OK\n"
return ""
}
String errorsMsg = errorStream.reduce("", String::concat)
if (errorsMsg) {
throw new GradleException(errorsMsg)
} }
} }