← Back to team overview

openlp-core team mailing list archive

Re: [Merge] lp:~tomasgroth/openlp/chordpro-fixes into lp:openlp

 

Review: Needs Fixing

Minor issue.

Diff comments:

> === modified file 'openlp/plugins/songs/lib/importers/chordpro.py'
> --- openlp/plugins/songs/lib/importers/chordpro.py	2019-04-13 13:00:22 +0000
> +++ openlp/plugins/songs/lib/importers/chordpro.py	2019-08-28 19:52:20 +0000
> @@ -73,6 +75,29 @@
>                      self.title = tag_value
>                  elif tag_name in ['subtitle', 'su', 'st']:
>                      self.alternate_title = tag_value
> +                elif tag_name == 'composer':
> +                    self.parse_author(tag_value, AuthorType.Music)
> +                elif tag_name in ['lyricist', 'author']:

Sorry, one small change. According to the ChordPro site, there's no "author" but there is an "artist"

> +                    self.parse_author(tag_value, AuthorType.Words)
> +                elif tag_name == 'meta':
> +                    meta_tag_name, meta_tag_value = tag_value.split(' ', 1)
> +                    # Skip, if no value
> +                    if not meta_tag_value:
> +                        continue
> +                    # The meta-tag can contain anything. We check for title, subtitle, composer, lyricist
> +                    if meta_tag_name in ['title', 't']:
> +                        self.title = meta_tag_value
> +                    elif meta_tag_name in ['subtitle', 'su', 'st']:
> +                        self.alternate_title = meta_tag_value
> +                    elif meta_tag_name == 'composer':
> +                        self.parse_author(meta_tag_value, AuthorType.Music)
> +                    elif meta_tag_name in ['lyricist', 'author']:

Same as above

> +                        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'):


-- 
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/371955
Your team OpenLP Core is subscribed to branch lp:openlp.


References