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

Added detection of songbeamer tags, if they are manually inserted or not.

This commit is contained in:
Tomas Groth 2017-05-07 22:26:03 +02:00
parent d60ea23de6
commit e00e8117a9
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
openlp/plugins/songs/lib/importers/songbeamer.py
View File

@ -62,6 +62,13 @@ class SongBeamerTypes(object):
} }
class VerseTagMode(object):
Unknown = 0
ContainsTags = 1
ContainsNoTags = 2
ContainsNoTagsRestart = 3
class SongBeamerImport(SongImport): class SongBeamerImport(SongImport):
""" """
Import Song Beamer files(s). Song Beamer file format is text based in the beginning are one or more control tags Import Song Beamer files(s). Song Beamer file format is text based in the beginning are one or more control tags
@ -130,8 +137,12 @@ class SongBeamerImport(SongImport):
read_verses = False read_verses = False
# The first verse separator doesn't count, but the others does, so line count starts at -1 # The first verse separator doesn't count, but the others does, so line count starts at -1
line_number = -1 line_number = -1
for line in song_data: verse_tags_mode = VerseTagMode.Unknown
line = line.rstrip() first_verse = True
idx = -1
while idx + 1 < len(song_data):
idx = idx + 1
line = song_data[idx].rstrip()
stripped_line = line.strip() stripped_line = line.strip()
if line.startswith('#') and not read_verses: if line.startswith('#') and not read_verses:
self.parse_tags(line) self.parse_tags(line)
@ -142,6 +153,7 @@ class SongBeamerImport(SongImport):
self.add_verse(self.current_verse, self.current_verse_type) self.add_verse(self.current_verse, self.current_verse_type)
self.current_verse = '' self.current_verse = ''
self.current_verse_type = VerseType.tags[VerseType.Verse] self.current_verse_type = VerseType.tags[VerseType.Verse]
first_verse = False
read_verses = True read_verses = True
verse_start = True verse_start = True
# Songbeamer allows chord on line "-1", meaning the first line has only chords # Songbeamer allows chord on line "-1", meaning the first line has only chords
@ -157,11 +169,33 @@ class SongBeamerImport(SongImport):
elif read_verses: elif read_verses:
if verse_start: if verse_start:
verse_start = False verse_start = False
if not self.check_verse_marks(line): verse_mark = self.check_verse_marks(line)
# To ensure that linenumbers are mapped correctly when inserting chords, we attempt to detect
# if verse tags are inserted manually or by SongBeamer. If they are inserted manually the lines
# should be counted, otherwise not. If all verses start with a tag we assume it is inserted by
# SongBeamer.
if first_verse and verse_tags_mode == VerseTagMode.Unknown:
if verse_mark:
verse_tags_mode = VerseTagMode.ContainsTags
else:
verse_tags_mode = VerseTagMode.ContainsNoTags
elif verse_tags_mode != VerseTagMode.ContainsNoTagsRestart:
if not verse_mark and verse_tags_mode == VerseTagMode.ContainsTags:
# Restart loop without counting tags as lines
self.set_defaults()
self.title = file_name.split('.sng')[0]
verse_tags_mode = VerseTagMode.ContainsNoTagsRestart
read_verses = False
# The first verse separator doesn't count, but the others does, so line count starts at -1
line_number = -1
first_verse = True
idx = -1
continue
if not verse_mark:
line = self.insert_chords(line_number, line) line = self.insert_chords(line_number, line)
self.current_verse += line.strip() + '\n' self.current_verse += line.strip() + '\n'
line_number += 1 line_number += 1
elif self.editor_version < 4: elif verse_tags_mode in [VerseTagMode.ContainsNoTags, VerseTagMode.ContainsNoTagsRestart]:
line_number += 1 line_number += 1
else: else:
line = self.insert_chords(line_number, line) line = self.insert_chords(line_number, line)