mahefa/feufaro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Validate first song key, with support minor key

Browse source
This commit is contained in:
Hasinjato 2026-08-13 12:16:27 +03:00
parent b935c7d8f0
commit 640be8edb5
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
View file

@ -2361,14 +2361,20 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
} }
if ("c" == subKey) { if ("c" == subKey) {
val validKeys = Transpose.keyToNumber.sortedByDescending { it.length } val validKeys = Transpose.keyToNumber.sortedByDescending { it.length }
val keyRegex = Regex("\\b(${validKeys.joinToString("|")})\\b", RegexOption.IGNORE_CASE) val keyRegex = Regex("\\b(${validKeys.joinToString("|")})(m)?\\b", RegexOption.IGNORE_CASE)
val rawText = line.substringAfter("c:") val rawText = line.substringAfter("c:")
val matchedKey = keyRegex.find(rawText)?.value val matchResult = keyRegex.find(rawText)
val tonality = Transpose.keyToNumber.firstOrNull { it.equals(matchedKey, ignoreCase = true) }
if(tonality != null) { if (matchResult != null) {
meta["C"] = tonality val rawBaseKey = matchResult.groupValues[1]
sharedScreenModel.setSongKey(tonality) val hasMinor = matchResult.groupValues[2].isNotEmpty()
sharedScreenModel.setTransposeAsIf(tonality) val baseTonality = Transpose.keyToNumber.firstOrNull { it.equals(rawBaseKey, ignoreCase = true) }
if (baseTonality != null) {
val tonality = if (hasMinor) "${baseTonality}m" else baseTonality
meta["C"] = tonality
sharedScreenModel.setSongKey(tonality)
sharedScreenModel.setTransposeAsIf(tonality)
}
} }
} }
} }