openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'ew7-support' into 'master' 

Minor fix for EasyWorship import

See merge request openlp/openlp!585
This commit is contained in:
Raoul Snyman 2023-02-21 18:12:31 +00:00
parent f22eafbeb8 84e8e7dc17
commit ef1b92eccd
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openlp/plugins/songs/lib/importer.py
View File

@ -254,27 +254,27 @@ class SongFormat(object):
},
EasyWorshipDB: {
'class': EasyWorshipSongImport,
'name': 'EasyWorship Song Database',
'name': 'EasyWorship 2007/2009 Song Database',
'prefix': 'ew',
'selectMode': SongFormatSelect.SingleFile,
'filter': '{text} (*.DB)'.format(text=translate('SongsPlugin.ImportWizardForm',
'EasyWorship Song Database'))
'EasyWorship 2007/2009 Song Database'))
},
EasyWorshipSqliteDB: {
'class': EasyWorshipSongImport,
'name': 'EasyWorship 6 Song Database',
'name': 'EasyWorship 6/7 Song Database',
'prefix': 'ew',
'selectMode': SongFormatSelect.SingleFolder,
'filter': '{text} (*.db)'.format(text=translate('SongsPlugin.ImportWizardForm',
'EasyWorship 6 Song Data Directory'))
'EasyWorship 6/7 Song Data Directory'))
},
EasyWorshipService: {
'class': EasyWorshipSongImport,
'name': 'EasyWorship Service',
'name': 'EasyWorship 2007/2009 Service File',
'prefix': 'ew',
'selectMode': SongFormatSelect.SingleFile,
'filter': '{text} (*.ews)'.format(text=translate('SongsPlugin.ImportWizardForm',
'EasyWorship Service File'))
'EasyWorship 2007/2009 Service File'))
},
FoilPresenter: {
'class': FoilPresenterImport,

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

@ -392,8 +392,10 @@ class EasyWorshipSongImport(SongImport):
self.author = song[2]
self.copyright = song[3]
self.ccli_number = song[4]
words = words_db.execute('SELECT words FROM word WHERE song_id = ?;', (song_id,))
self.set_song_import_object(self.author, words.fetchone()[0].encode())
song_words_result = words_db.execute('SELECT words FROM word WHERE song_id = ?;', (song_id,))
words = song_words_result.fetchone()
if words:
self.set_song_import_object(self.author, words[0].encode())
if not self.finish():
self.log_error(self.import_source,
translate('SongsPlugin.EasyWorshipSongImport',

BIN
tests/resources/songs/easyworship/ew6/Databases/Data/Songs.db
View File

Binary file not shown.