fix: legacy chords with commas and spaces

This commit is contained in:
2023-12-08 22:10:49 +01:00
parent 50a09d2008
commit bf4c86e698

View File

@@ -1,6 +1,8 @@
import {KEYMAP_IDS} from "$lib/serial/keymap-codes"
import type {CharaChordFile} from "$lib/share/chara-file"
const SPECIAL_KEYS = new Map<string, string>([[" ", "SPACE"]])
export function csvChordsToJson(csv: string): CharaChordFile {
return {
charaVersion: 1,
@@ -9,18 +11,18 @@ export function csvChordsToJson(csv: string): CharaChordFile {
.trim()
.split("\n")
.map(line => {
const [input, output] = line.split(",", 2)
const [input, output] = line.split(/,(?=[^,]*$)/, 2)
return [
input.split("+").map(it => KEYMAP_IDS.get(it.trim())?.code ?? 0),
output
.trim()
.split("")
.map(it => KEYMAP_IDS.get(it)?.code ?? 0),
.map(it => KEYMAP_IDS.get(SPECIAL_KEYS.get(it) ?? it)?.code ?? 0),
]
}),
}
}
export function isCsvChords(csv: string): boolean {
return /^([^+, ]+( *\+ *[^+, ]+)* *, *[^+, ]+ *(\n|(?=$)))+$/.test(csv)
return /^([^+]+( *\+ *[^+]+)* *, *[^+, ]+ *(\n|(?=$)))+$/.test(csv)
}