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

Handle a few videopsalm quirks

Browse Source
This commit is contained in:
Tomas Groth 2017-01-12 22:03:06 +01:00
parent c8184f2ea1
commit 32d3c0038e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,8 +65,8 @@ class VideoPsalmImport(SongImport):
if c == '\n': if c == '\n':
if inside_quotes: if inside_quotes:
processed_content += '\\n' processed_content += '\\n'
# Put keys in quotes # Put keys in quotes. The '-' is for handling nagative numbers
elif c.isalnum() and not inside_quotes: elif (c.isalnum() or c == '-') and not inside_quotes:
processed_content += '"' + c processed_content += '"' + c
c = next(file_content_it) c = next(file_content_it)
while c.isalnum(): while c.isalnum():
@ -121,6 +121,8 @@ class VideoPsalmImport(SongImport):
if 'Memo3' in song: if 'Memo3' in song:
self.add_comment(song['Memo3']) self.add_comment(song['Memo3'])
for verse in song['Verses']: for verse in song['Verses']:
if 'Text' not in verse:
continue
self.add_verse(verse['Text'], 'v') self.add_verse(verse['Text'], 'v')
if not self.finish(): if not self.finish():
self.log_error('Could not import {title}'.format(title=self.title)) self.log_error('Could not import {title}'.format(title=self.title))

2
tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold.json
View File

@ -1,4 +1,4 @@
{Abbreviation:"SB1",Copyright:"Public domain",Songs:[{ID:3,Composer:"Unknown",Author:"Martin Luther",Copyright:"Public {Abbreviation:"SB1",Copyright:"Public domain",Songs:[{ID:3,Composer:"Unknown",Author:"Martin Luther",Capo:-1,Copyright:"Public
Domain",Theme:"tema1 Domain",Theme:"tema1
tema2",CCLI:"12345",Alias:"A safe stronghold",Memo1:"This is tema2",CCLI:"12345",Alias:"A safe stronghold",Memo1:"This is
the first comment the first comment