feat: improve chords regexps

Signed-off-by: Martin Chodur <[email protected]>
FUSAKLA · Apr 6, 2024 · 82c9a33 · 82c9a33
1 parent 4b0b086
commit 82c9a33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/chords/images.ts b/src/chords/images.ts
@@ -27,9 +27,8 @@ function SaveUserInstrument(instrument: string) {
 }
 
 function loadUserInstrument() {
-  const instrument = PropertiesService.getUserProperties().getProperty(
-    "userInstrument"
-  );
+  const instrument =
+    PropertiesService.getUserProperties().getProperty("userInstrument");
   if (instrument === null) {
     return supportedInstruments[0];
   }

diff --git a/src/chords/utils.ts b/src/chords/utils.ts
@@ -1,7 +1,7 @@
 function getDocumentChordsParagraphs(doc: GoogleAppsScript.Document.Document) {
   const body = doc.getBody();
   const chordsRe =
-    /^\s*(?:[A-Za-z]+\:\s*)?(?:\(?([A-Z][a-zA-Z0-9#!/]{0,6})\)?\s*)+\s*$/;
+    /^\s*(?:[A-Za-z]+\:\s*)?(?:[\[\|\/\(]*([A-Z][a-zA-Z0-9#!/]{0,6})[\|\/\(\]]*\s*)+\s*$/;
   const paragraphs = body.getParagraphs();
   const chordsParagraphs: GoogleAppsScript.Document.Paragraph[] = [];
   for (let i = 0; i < paragraphs.length; i++) {
@@ -16,7 +16,7 @@ function getDocumentChordsParagraphs(doc: GoogleAppsScript.Document.Document) {
 function getChords(doc: GoogleAppsScript.Document.Document) {
   const chords: string[] = [];
   for (const p of getDocumentChordsParagraphs(doc)) {
-    for (const chord of p.getText().split(/\s+/)) {
+    for (const chord of p.getText().split(/\s+|[\|\/\(\)\[\]]+/)) {
       if (chord.trim() === "") {
         continue;
       }