raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for more meta directives.

Browse Source
This commit is contained in:
Tomas Groth 2019-08-28 21:28:27 +02:00
parent d3a053c0da
commit b999b2a55e
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openlp/plugins/songs/lib/importers/chordpro.py
View File

@ -77,7 +77,7 @@ class ChordProImport(SongImport):
self.alternate_title = tag_value self.alternate_title = tag_value
elif tag_name == 'composer': elif tag_name == 'composer':
self.parse_author(tag_value, AuthorType.Music) self.parse_author(tag_value, AuthorType.Music)
elif tag_name == 'lyricist': elif tag_name in ['lyricist', 'author']:
self.parse_author(tag_value, AuthorType.Words) self.parse_author(tag_value, AuthorType.Words)
elif tag_name == 'meta': elif tag_name == 'meta':
meta_tag_name, meta_tag_value = tag_value.split(' ', 1) meta_tag_name, meta_tag_value = tag_value.split(' ', 1)
@ -91,8 +91,13 @@ class ChordProImport(SongImport):
self.alternate_title = meta_tag_value self.alternate_title = meta_tag_value
elif meta_tag_name == 'composer': elif meta_tag_name == 'composer':
self.parse_author(meta_tag_value, AuthorType.Music) 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) 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']: elif tag_name in ['comment', 'c', 'comment_italic', 'ci', 'comment_box', 'cb']:
# Detect if the comment is used as a chorus repeat marker # Detect if the comment is used as a chorus repeat marker
if tag_value.lower().startswith('chorus'): 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 no title was in directives, get it from the first line
if not self.title: if not self.title:
(verse_def, verse_text, lang) = self.verses[0] (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(): if not self.finish():
self.log_error(song_file.name) self.log_error(song_file.name)

2
tests/resources/songs/chordpro/swing-low.chordpro
View File

@ -1,5 +1,7 @@
{title:Swing Low Sweet Chariot} {title:Swing Low Sweet Chariot}
{st:Traditional} {st:Traditional}
{lyricist:Wallis Willis}
{meta:composer Wallis Willis}
{start_of_chorus} {start_of_chorus}
Swing [D]low, sweet [G]chari[D]ot, Swing [D]low, sweet [G]chari[D]ot,

4
tests/resources/songs/chordpro/swing-low.json
View File

@ -1,6 +1,10 @@
{ {
"title": "Swing Low Sweet Chariot", "title": "Swing Low Sweet Chariot",
"alternative_title": "Traditional", "alternative_title": "Traditional",
"authors": [
["Wallis Willis", "words"],
["Wallis Willis", "music"]
],
"verses": [ "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.", "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.",