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

Fix undefined auto_verse_order_ok case, and add some test resources

Browse Source
This commit is contained in:
john 2019-06-29 15:43:32 +01:00
parent 2bfa620ebf
commit 8f91f0c787
3 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/plugins/songs/lib/importers/singingthefaith.py
View File

@ -82,6 +82,7 @@ class SingingTheFaithImport(SongImport):
current_verse_number = 1 current_verse_number = 1
has_chorus = False has_chorus = False
chorus_written = False chorus_written = False
auto_verse_order_ok = False
verses = [] verses = []
author = '' author = ''
copyright = '' copyright = ''

30
tests/resources/songs/singingthefaith/H2.txt Normal file
View File

@ -0,0 +1,30 @@
1 Amazing Grace! how sweet the sound!
That saved a wretch like me!
I once was lost, but now am found;
Was blind, but now I see.
2 'Twas grace that taught my heart to fear,
And grace my fears relieved.
How precious did that grace appear,
The hour I first believed.
3 The Lord has promised good to me,
His Word my hope secures.
He will my shield and portion be
As long as life endures.
4 Thro' many dangers, toils and snares
I have already come.
'Tis grace that brought me safe thus far,
And grace will lead me home.
5 When we've been there ten thousand years,
Bright shining as the sun,
We've no less days to sing God's praise,
Than when we first begun.
John Newton (d. 1807)
Reproduced from Singing the Faith Electronic Words Edition, number 2 - or not as this is a hand made test file

29
tests/resources/songs/singingthefaith/STF002.json Normal file
View File

@ -0,0 +1,29 @@
{
"title": "STF002 - Amazing Grace! how sweet the sound!",
"authors": [
"John Newton (d. 1807)"
],
"verse_order_list": ["v1", "v2", "v3", "v4", "v5"],
"verses": [
[
"Amazing Grace! how sweet the sound!\nThat saved a wretch like me!\nI once was lost, but now am found;\nWas blind, but now I see.",
"v"
],
[
"'Twas grace that taught my heart to fear,\nAnd grace my fears relieved.\nHow precious did that grace appear,\nThe hour I first believed.",
"v"
],
[
"The Lord has promised good to me,\nHis Word my hope secures.\nHe will my shield and portion be\nAs long as life endures.",
"v"
],
[
"Thro' many dangers, toils and snares\nI have already come.\n'Tis grace that brought me safe thus far,\nAnd grace will lead me home.",
"v"
],
[
"When we've been there ten thousand years,\nBright shining as the sun,\nWe've no less days to sing God's praise,\nThan when we first begun.",
"v"
]
]
}