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

Add proper error messages to EasyWorship import.

Browse Source 
Also make sure that Songs.db (lowercase ending) is also being recognized.

bzr-revno: 2196
Fixes: https://launchpad.net/bugs/1326664
This commit is contained in:
Samuel Mehrbrodt 2014-06-12 20:55:53 +02:00 committed by Raoul Snyman
commit a045ae3533
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openlp/plugins/songs/lib/ewimport.py
View File

@ -64,13 +64,23 @@ class EasyWorshipSongImport(SongImport):
def doImport(self): def doImport(self):
# Open the DB and MB files if they exist # Open the DB and MB files if they exist
import_source_mb = self.importSource.replace('.DB', '.MB') import_source_mb = self.importSource.replace('.DB', '.MB').replace('.db', '.mb')
if not os.path.isfile(self.importSource): if not os.path.isfile(self.importSource):
self.logError(self.importSource, translate(
'SongsPlugin.EasyWorshipSongImport',
'This file does not exist.'))
return return
if not os.path.isfile(import_source_mb): if not os.path.isfile(import_source_mb):
self.logError(self.importSource, translate(
'SongsPlugin.EasyWorshipSongImport',
'Could not find the "Songs.MB" file. It must be in the same '
'folder as the "Songs.DB" file.'))
return return
db_size = os.path.getsize(self.importSource) db_size = os.path.getsize(self.importSource)
if db_size < 0x800: if db_size < 0x800:
self.logError(self.importSource, translate(
'SongsPlugin.EasyWorshipSongImport',
'This file is not a valid EasyWorship database.'))
return return
db_file = open(self.importSource, 'rb') db_file = open(self.importSource, 'rb')
self.memoFile = open(import_source_mb, 'rb') self.memoFile = open(import_source_mb, 'rb')
@ -80,6 +90,9 @@ class EasyWorshipSongImport(SongImport):
if header_size != 0x800 or block_size < 1 or block_size > 4: if header_size != 0x800 or block_size < 1 or block_size > 4:
db_file.close() db_file.close()
self.memoFile.close() self.memoFile.close()
self.logError(self.importSource, translate(
'SongsPlugin.EasyWorshipSongImport',
'This file is not a valid EasyWorship database.'))
return return
# Take a stab at how text is encoded # Take a stab at how text is encoded
self.encoding = u'cp1252' self.encoding = u'cp1252'
@ -193,7 +206,8 @@ class EasyWorshipSongImport(SongImport):
result = strip_rtf(words, self.encoding) result = strip_rtf(words, self.encoding)
except UnicodeDecodeError: except UnicodeDecodeError:
# The unicode chars in the rtf was not escaped in the expected manner. # The unicode chars in the rtf was not escaped in the expected manner.
self.logError(self.title, unicode(translate('SongsPlugin.EasyWorshipSongImport', self.logError(self.title, unicode(translate(
'SongsPlugin.EasyWorshipSongImport',
'Unexpected data formatting.'))) 'Unexpected data formatting.')))
continue continue
if result is None: if result is None: