fix: chord files not detected properly

feat: alert on unknown backups
CharaChorder · Dec 8, 2023 · 8cbdf13 · 8cbdf13
1 parent 1ccb17f
commit 8cbdf13
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/lib/backup/backup.ts b/src/lib/backup/backup.ts
@@ -60,6 +60,8 @@ export async function restoreBackup(event: Event) {
     restoreFromFile(csvLayoutToJson(text))
   } else if (isCsvChords(text)) {
     restoreFromFile(csvChordsToJson(text))
+  } else {
+    alert("Unknown backup format")
   }
 }
 

diff --git a/src/lib/backup/compat/legacy-chords.ts b/src/lib/backup/compat/legacy-chords.ts
@@ -5,16 +5,19 @@ export function csvChordsToJson(csv: string): CharaChordFile {
   return {
     charaVersion: 1,
     type: "chords",
-    chords: csv.split("\n").map(line => {
-      const [input, output] = line.split(",", 2)
-      return [
-        input.split("+").map(it => KEYMAP_IDS.get(it.trim())?.code ?? 0),
-        output.split("").map(it => KEYMAP_IDS.get(it.trim())?.code ?? 0),
-      ]
-    }),
+    chords: csv
+      .trim()
+      .split("\n")
+      .map(line => {
+        const [input, output] = line.split(",", 2)
+        return [
+          input.split("+").map(it => KEYMAP_IDS.get(it.trim())?.code ?? 0),
+          output.split("").map(it => KEYMAP_IDS.get(it.trim())?.code ?? 0),
+        ]
+      }),
   }
 }
 
 export function isCsvChords(csv: string): boolean {
-  return /^([^+,\s]( *\+ *[^+,\s]+)* *, *[^+,\s]+ *(\n|(?=$)))+$/.test(csv)
+  return /^([^+, ]+( *\+ *[^+, ]+)* *, *[^+, ]+ *(\n|(?=$)))+$/.test(csv)
 }