From 298a159b5ecfd1f6847de875368abf05b99c9a60 Mon Sep 17 00:00:00 2001 From: Derek Scotney Date: Tue, 7 Dec 2010 23:10:57 +0200 Subject: [PATCH] Update to verse types --- openlp/plugins/songs/lib/cclifileimport.py | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py index c22c987f4..adb55ee6d 100755 --- a/openlp/plugins/songs/lib/cclifileimport.py +++ b/openlp/plugins/songs/lib/cclifileimport.py @@ -30,6 +30,7 @@ import chardet import codecs from songimport import SongImport +from openlp.plugins.songs.lib import VerseType log = logging.getLogger(__name__) @@ -170,28 +171,26 @@ class CCLIFileImport(SongImport): words_list = song_words.split(u'/t') for counter in range(0, len(field_list)): if field_list[counter].startswith(u'Ver'): - verse_type = u'V' + verse_type = VerseType.to_string(VerseType.Verse) elif field_list[counter].startswith(u'Ch'): - verse_type = u'C' + verse_type = VerseType.to_string(VerseType.Chorus) elif field_list[counter].startswith(u'Br'): - verse_type = u'B' + verse_type = VerseType.to_string(VerseType.Bridge) else: #Other - verse_type = u'O' + verse_type = VerseType.to_string(VerseType.Other) check_first_verse_line = True verse_text = unicode(words_list[counter]) verse_text = verse_text.replace("/n", "\n") verse_lines = verse_text.split(u'\n', 1) if check_first_verse_line: if verse_lines[0].startswith(u'(PRE-CHORUS'): - verse_type = u'P' - log.debug(u'USR verse PRE-CHORUS: %s', verse_lines[0] ) + verse_type = VerseType.to_string(VerseType.PreChorus) verse_text = verse_lines[1] elif verse_lines[0].startswith(u'(BRIDGE'): - verse_type = u'B' - log.debug(u'USR verse BRIDGE') + verse_type = VerseType.to_string(VerseType.Bridge) verse_text = verse_lines[1] elif verse_lines[0].startswith(u'('): - verse_type = u'O' + verse_type = VerseType.to_string(VerseType.Other) verse_text = verse_lines[1] if len(verse_text) > 0: self.add_verse(verse_text, verse_type) @@ -276,31 +275,31 @@ class CCLIFileImport(SongImport): verse_desc_parts = clean_line.split(' ') if len(verse_desc_parts) == 2: if verse_desc_parts[0].startswith(u'Ver'): - verse_type = u'V' + verse_type = VerseType.to_string(VerseType.Verse) elif verse_desc_parts[0].startswith(u'Ch'): - verse_type = u'C' + verse_type = VerseType.to_string(VerseType.Chorus) elif verse_desc_parts[0].startswith(u'Br'): - verse_type = u'B' + verse_type = VerseType.to_string(VerseType.Bridge) else: #we need to analyse the next line for #verse type, so set flag - verse_type = u'O' + verse_type = VerseType.to_string(VerseType.Other) check_first_verse_line = True verse_number = verse_desc_parts[1] else: - verse_type = u'O' + verse_type = VerseType.to_string(VerseType.Other) verse_number = 1 verse_start = True else: #check first line for verse type if check_first_verse_line: if line.startswith(u'(PRE-CHORUS'): - verse_type = u'P' + verse_type = VerseType.to_string(VerseType.PreChorus) elif line.startswith(u'(BRIDGE'): - verse_type = u'B' + verse_type = VerseType.to_string(VerseType.Bridge) # Handle all other misc types elif line.startswith(u'('): - verse_type = u'O' + verse_type = VerseType.to_string(VerseType.Other) else: verse_text = verse_text + line check_first_verse_line = False