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

review fixes

Browse Source
This commit is contained in:
Benny 2011-07-05 14:00:34 +02:00
parent 6436b05240
commit 1876d520ae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/plugins/songs/lib/ewimport.py
View File

@ -278,18 +278,18 @@ class EasyWorshipSongImport(SongImport):
verse_type = VerseType.Tags[VerseType.Verse] verse_type = VerseType.Tags[VerseType.Verse]
for verse in SLIDE_BREAK_REGEX.split(words): for verse in SLIDE_BREAK_REGEX.split(words):
verse = verse.strip() verse = verse.strip()
if len(verse) == 0: if not verse:
continue continue
verse_split = verse.split(u'\n', 1) verse_split = verse.split(u'\n', 1)
first_line_is_tag = False first_line_is_tag = False
# EW tags: verse, chorus, pre-chorus, bridge, tag, # EW tags: verse, chorus, pre-chorus, bridge, tag,
# intro, ending, slide # intro, ending, slide
for type in VerseType.Names+['tag', 'slide']: for type in VerseType.Names+[u'tag', u'slide']:
type = type.lower() type = type.lower()
ew_tag = verse_split[0].strip().lower() ew_tag = verse_split[0].strip().lower()
if ew_tag.startswith(type): if ew_tag.startswith(type):
verse_type = type[0] verse_type = type[0]
if type == 'tag' or type == 'slide': if type == u'tag' or type == u'slide':
verse_type = VerseType.Tags[VerseType.Other] verse_type = VerseType.Tags[VerseType.Other]
first_line_is_tag = True first_line_is_tag = True
number_found = False number_found = False
@ -298,7 +298,7 @@ class EasyWorshipSongImport(SongImport):
match = NUMBER_REGEX.search(ew_tag) match = NUMBER_REGEX.search(ew_tag)
if match: if match:
number = match.group() number = match.group()
verse_type +=number verse_type += number
number_found = True number_found = True
match = NOTE_REGEX.search(ew_tag) match = NOTE_REGEX.search(ew_tag)
if match: if match: