From 84e8e7dc17d7841c5cca68026c51d1df9e5e71fe Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Sun, 19 Feb 2023 22:30:03 +0100
Subject: [PATCH] Minor fix for EasyWorship import

---
 openlp/plugins/songs/lib/importer.py          |  12 ++++++------
 .../songs/lib/importers/easyworship.py        |   6 ++++--
 .../easyworship/ew6/Databases/Data/Songs.db   | Bin 16384 -> 16384 bytes
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index ba74588b3..6b9044f59 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -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,
diff --git a/openlp/plugins/songs/lib/importers/easyworship.py b/openlp/plugins/songs/lib/importers/easyworship.py
index 2882d8572..176ba6653 100644
--- a/openlp/plugins/songs/lib/importers/easyworship.py
+++ b/openlp/plugins/songs/lib/importers/easyworship.py
@@ -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',
diff --git a/tests/resources/songs/easyworship/ew6/Databases/Data/Songs.db b/tests/resources/songs/easyworship/ew6/Databases/Data/Songs.db
index b8d62ea44b23f63bd489295c852cc767c6387782..30b932e9fcc2d9b5402ebd6211630185787ae5c5 100644
GIT binary patch
delta 724
zcmbu7ziSjx5Xax#_uUC$g9(A;@CR-oq>%OA?%Vre4CuLQNK`O_oL-}BHcvc^8;H3=
z8_z0mSSSmrf>>BsDY_Q<11uzk0V|7CX_6uY17e|#17dXs6sMTx1D~1iFr5x{I`rf)
zSx=7yc}twUdFajT^8=QoL|`uWIyX*9HYjh<!$%k8fG|zt>d}5KA}UM=Q%)^5am9;o
z`M#-muF_Fi=~{eBD>o`fWj9i0rmB3u<~rd-P}gDEbCef&j$hF=r>@RTIKFbLeyD>`
zx##ycUhY-a?MV|YEZUb^cZ_}Yb}KO#+OzlO6T1;5c4!(VSu_jN?U}h&Y=`rAqgFzK
z#^~LPf<B(h#``{yC9y5=9bd7FZI1aFg*=F)Om`0sGi(ZU@eEC@Gn|5}U}*mpdpDF>
zcc?8%zAZ|Nbt?iZJZT*n>mFld7%ugOkZCr0rB7m6;61)zIUOiYX0|+w;s`YTA)-uQ
zooKLrRj_;mYglFdOQdV1L6Y3ZnC%Gsz&Gq+huH@568+5f^boVnUu+Xw%s%~QTh*h?
m{`&%H_w)nylmwPId<h?U#xY#KCQb97PWgBLBh#fb_kRKuc)qLv

delta 237
zcmZo@U~Fh$oFL7}JyFJ)m778Lk>bXb1?*hROg0S6IZW%BY&HwB=rL`!;X1*{#mxMU
zf%zBn7v^_B!3WHf-|>q9#kv@nyO`%Op9hN7FmLV>E@fe4-Xy`o1C-j#!2FK+Jo9Ft
z)Kccjo7Dq3n3>lxFdt$5Fj+vtW3vKF6!YYD+F?MIr$8$2FrNad+`~M1hrZzC+xnV7
z@sAA5znQ-=e*}s@W}f`fSQsew93u7{D0Y*1@^f=ppcslHCU;p^0ma%GnA@4>FrNde
Lt7M+sZeIxi1OG?$