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

Moar minor changes

This commit is contained in:
Phill 2019-06-28 20:26:46 +01:00
parent e81a97f582
commit 8565db715f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/songs/lib/importers/wordsofworship.py
View File

@ -93,7 +93,7 @@ class WordsOfWorshipImport(SongImport):
* 0x00 = Normal * 0x00 = Normal
* 0x01 = Minor * 0x01 = Minor
It looks like this may have been introduced in Words of Worship song version 1.2.2, though this is an educated It looks like this may have been introduced in Words of Worship song version 2.1.0, though this is an educated
guess. guess.
Footer: Footer:
@ -152,7 +152,7 @@ class WordsOfWorshipImport(SongImport):
lines_to_read = read_int(song_data, DataType.U32, 'little') lines_to_read = read_int(song_data, DataType.U32, 'little')
for line_no in range(0, lines_to_read): for line_no in range(0, lines_to_read):
line_text = self.parse_string(song_data) line_text = self.parse_string(song_data)
if self.read_version >= (1, 2, 2): if self.read_version >= (2, 1, 0):
if read_or_fail(song_data, DataType.U8) == b'\x01': if read_or_fail(song_data, DataType.U8) == b'\x01':
line_text = '{{minor}}{text}{{/minor}}'.format(text=line_text) line_text = '{{minor}}{text}{{/minor}}'.format(text=line_text)
lines.append(line_text) lines.append(line_text)
@ -199,7 +199,7 @@ class WordsOfWorshipImport(SongImport):
with file_path.open('rb') as song_data: with file_path.open('rb') as song_data:
if not self.vaildate(file_path, song_data): if not self.vaildate(file_path, song_data):
continue continue
seek_or_fail(song_data, 24) seek_or_fail(song_data, 20)
self.read_version = self.parse_version(song_data) self.read_version = self.parse_version(song_data)
# Seek to byte which stores number of blocks in the song # Seek to byte which stores number of blocks in the song
seek_or_fail(song_data, 56) seek_or_fail(song_data, 56)

2
openlp/plugins/songs/lib/openlyricsxml.py
View File

@ -336,7 +336,7 @@ class OpenLyrics(object):
:return: the lyrics with the converted chords :return: the lyrics with the converted chords
""" """
# Process chords. # Process chords.
new_text = re.sub(r'\[(?!CDATA)(\w.*?)\]', r'<chord name="\1"/>', text) new_text = re.sub(r'\[(\w.*?)\]', r'<chord name="\1"/>', text)
return new_text return new_text
def _get_missing_tags(self, text): def _get_missing_tags(self, text):