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

Add validity checking to EasyWorship 6 importer.

Browse Source
This commit is contained in:
Gary Talent 2016-09-22 01:19:46 -05:00
parent 08416db1d3
commit ebbfd39dbd
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,9 +344,21 @@ class EasyWorshipSongImport(SongImport):
""" """
Import the songs from an EasyWorship 6 SQLite database Import the songs from an EasyWorship 6 SQLite database
""" """
songs_db_path = self.import_source + "/Databases/Data/Songs.db"
song_words_db_path = self.import_source + "/Databases/Data/SongWords.db"
# check to see if needed files are there
if not os.path.isfile(songs_db_path):
self.log_error(songs_db_path, translate('SongsPlugin.EasyWorshipSongImport',
'This file does not exist.'))
return
if not os.path.isfile(song_words_db_path):
self.log_error(song_words_db_path, translate('SongsPlugin.EasyWorshipSongImport',
'Could not find the "Songs.MB" file. It must be in the same '
'folder as the "Songs.DB" file.'))
return
# get database handles # get database handles
songs_conn = sqlite3.connect(self.import_source + "/Databases/Data/Songs.db") songs_conn = sqlite3.connect(songs_db_path)
words_conn = sqlite3.connect(self.import_source + "/Databases/Data/SongWords.db") words_conn = sqlite3.connect(song_words_db_path)
if songs_conn is None or words_conn is None: if songs_conn is None or words_conn is None:
self.log_error(self.import_source, translate('SongsPlugin.EasyWorshipSongImport', self.log_error(self.import_source, translate('SongsPlugin.EasyWorshipSongImport',
'This is not a valid Easy Worship 6 database.')) 'This is not a valid Easy Worship 6 database.'))