From b999b2a55e4b7533b878577ae78f2895e979b7cd Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Wed, 28 Aug 2019 21:28:27 +0200
Subject: [PATCH] Added support for more meta directives.

---
 openlp/plugins/songs/lib/importers/chordpro.py    | 14 +++++++++++---
 tests/resources/songs/chordpro/swing-low.chordpro |  2 ++
 tests/resources/songs/chordpro/swing-low.json     |  4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/songs/lib/importers/chordpro.py b/openlp/plugins/songs/lib/importers/chordpro.py
index aaa89ade9..3bea457fe 100644
--- a/openlp/plugins/songs/lib/importers/chordpro.py
+++ b/openlp/plugins/songs/lib/importers/chordpro.py
@@ -77,7 +77,7 @@ class ChordProImport(SongImport):
                     self.alternate_title = tag_value
                 elif tag_name == 'composer':
                     self.parse_author(tag_value, AuthorType.Music)
-                elif tag_name == 'lyricist':
+                elif tag_name in ['lyricist', 'author']:
                     self.parse_author(tag_value, AuthorType.Words)
                 elif tag_name == 'meta':
                     meta_tag_name, meta_tag_value = tag_value.split(' ', 1)
@@ -91,8 +91,13 @@ class ChordProImport(SongImport):
                         self.alternate_title = meta_tag_value
                     elif meta_tag_name == 'composer':
                         self.parse_author(meta_tag_value, AuthorType.Music)
-                    elif meta_tag_name == 'lyricist':
+                    elif meta_tag_name in ['lyricist', 'author']:
                         self.parse_author(meta_tag_value, AuthorType.Words)
+                    elif meta_tag_name in ['topic', 'topics']:
+                        for topic in meta_tag_value.split(','):
+                            self.topics.append(topic.strip())
+                    elif 'ccli' in meta_tag_name:
+                        self.ccli_number = meta_tag_value
                 elif tag_name in ['comment', 'c', 'comment_italic', 'ci', 'comment_box', 'cb']:
                     # Detect if the comment is used as a chorus repeat marker
                     if tag_value.lower().startswith('chorus'):
@@ -179,7 +184,10 @@ class ChordProImport(SongImport):
         # if no title was in directives, get it from the first line
         if not self.title:
             (verse_def, verse_text, lang) = self.verses[0]
-            self.title = verse_text.split_lines()[0]
+            # strip any chords from the title
+            self.title = re.sub(r'\[.*?\]', '', verse_text.split('\n')[0])
+            # strip the last char if it a punctuation
+            self.title = re.sub(r'[^\w\s]$', '', self.title)
         if not self.finish():
             self.log_error(song_file.name)
 
diff --git a/tests/resources/songs/chordpro/swing-low.chordpro b/tests/resources/songs/chordpro/swing-low.chordpro
index cd4569c64..76ed19181 100644
--- a/tests/resources/songs/chordpro/swing-low.chordpro
+++ b/tests/resources/songs/chordpro/swing-low.chordpro
@@ -1,5 +1,7 @@
 {title:Swing Low Sweet Chariot}
 {st:Traditional}
+{lyricist:Wallis Willis}
+{meta:composer Wallis Willis}
 
 {start_of_chorus}
 Swing [D]low, sweet [G]chari[D]ot,
diff --git a/tests/resources/songs/chordpro/swing-low.json b/tests/resources/songs/chordpro/swing-low.json
index 271d1680f..b2bd03659 100644
--- a/tests/resources/songs/chordpro/swing-low.json
+++ b/tests/resources/songs/chordpro/swing-low.json
@@ -1,6 +1,10 @@
 {
     "title": "Swing Low Sweet Chariot",
     "alternative_title": "Traditional",
+    "authors": [
+        ["Wallis Willis", "words"],
+        ["Wallis Willis", "music"]
+    ],
     "verses": [
         [
             "Swing [D]low, sweet [G]chari[D]ot,\nComin' for to carry me [A7]home.\nSwing [D7]low, sweet [G]chari[D]ot,\nComin' for to [A7]carry me [D]home.",