Theaninova/DeviceManager
1
0
Fork 0
mirror of https://github.com/CharaChorder/DeviceManager.git synced 2025-12-24 03:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: legacy chords with commas and spaces

Browse Source
This commit is contained in:
Thea Schöbl
2023-12-08 22:10:49 +01:00
parent 50a09d2008
commit bf4c86e698
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/backup/compat/legacy-chords.ts
View File

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