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

EasyWorshipSongImport: use tag from previous slide for slides without tag, fix regex for notes

Browse Source
This commit is contained in:
Benny 2011-07-02 00:45:27 +02:00
parent 306826bbeb
commit bc808ade93
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,6 +261,7 @@ class EasyWorshipSongImport(SongImport):
# Format the lyrics # Format the lyrics
words = strip_rtf(words, self.encoding) # TODO: convert rtf instead of stripping? words = strip_rtf(words, self.encoding) # TODO: convert rtf instead of stripping?
p = re.compile(r'\n *?\n[\n ]*') # at least two newlines, with zero or more space characters between them p = re.compile(r'\n *?\n[\n ]*') # at least two newlines, with zero or more space characters between them
verse_type = VerseType.Tags[VerseType.Verse] # TODO!!!: use previous verse type....
for verse in p.split(words): for verse in p.split(words):
#for verse in words.split(u'\n\n'): #for verse in words.split(u'\n\n'):
# ew tags: verse, chorus, pre-chorus, bridge, tag, intro, ending, slide # ew tags: verse, chorus, pre-chorus, bridge, tag, intro, ending, slide
@ -268,13 +269,11 @@ class EasyWorshipSongImport(SongImport):
if len(verse) == 0: if len(verse) == 0:
continue continue
verse_split = verse.split(u'\n', 1) verse_split = verse.split(u'\n', 1)
verse_type = VerseType.Tags[VerseType.Verse]
first_line_is_tag = False first_line_is_tag = False
for type in VerseType.Names+['tag', 'slide']: # doesnt cover tag, slide for type in VerseType.Names+['tag', 'slide']: # doesnt cover tag, 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):
#print ew_tag
verse_type = type[0] verse_type = type[0]
if type == 'tag' or type == 'slide': if type == 'tag' or type == 'slide':
verse_type = VerseType.Tags[VerseType.Other] verse_type = VerseType.Tags[VerseType.Other]
@ -286,7 +285,7 @@ class EasyWorshipSongImport(SongImport):
number = m.group() number = m.group()
verse_type +=number verse_type +=number
p = re.compile(r'\(.*\)') p = re.compile(r'\(.*?\)')
m = re.search(p, ew_tag) m = re.search(p, ew_tag)
if m: if m:
self.comments += ew_tag+'\n' self.comments += ew_tag+'\n'