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

Fix choruses, bridges & etc. being imported as verses in CCLI txt files

Browse Source
This commit is contained in:
Philip Ridout 2019-03-03 13:32:31 +00:00
parent c761592095
commit 07ffb7c0d0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/settings.py
View File

@ -540,7 +540,7 @@ class Settings(QtCore.QSettings):
old_values = [self._convert_value(old_value, default_value) old_values = [self._convert_value(old_value, default_value)
for old_value, default_value in zip(old_values, default_values)] for old_value, default_value in zip(old_values, default_values)]
# Iterate over our rules and check what the old_value should be "converted" to. # Iterate over our rules and check what the old_value should be "converted" to.
new_value = None new_value = old_values[0]
for new_rule, old_rule in rules: for new_rule, old_rule in rules:
# If the value matches with the condition (rule), then use the provided value. This is used to # If the value matches with the condition (rule), then use the provided value. This is used to
# convert values. E. g. an old value 1 results in True, and 0 in False. # convert values. E. g. an old value 1 results in True, and 0 in False.

3
openlp/plugins/songs/lib/importers/cclifile.py
View File

@ -254,7 +254,6 @@ class CCLIFileImport(SongImport):
song_author = '' song_author = ''
verse_start = False verse_start = False
for line in text_list: for line in text_list:
verse_type = 'v'
clean_line = line.strip() clean_line = line.strip()
if not clean_line: if not clean_line:
if line_number == 0: if line_number == 0:
@ -279,7 +278,7 @@ class CCLIFileImport(SongImport):
elif not verse_start: elif not verse_start:
# We have the verse descriptor # We have the verse descriptor
verse_desc_parts = clean_line.split(' ') verse_desc_parts = clean_line.split(' ')
if len(verse_desc_parts) == 2: if len(verse_desc_parts):
if verse_desc_parts[0].startswith('Ver'): if verse_desc_parts[0].startswith('Ver'):
verse_type = VerseType.tags[VerseType.Verse] verse_type = VerseType.tags[VerseType.Verse]
elif verse_desc_parts[0].startswith('Ch'): elif verse_desc_parts[0].startswith('Ch'):