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

Fix different method and variable names

This commit is contained in:
Samuel Mehrbrodt 2014-06-09 10:20:34 +02:00
parent f79fe709b1
commit d3923fa08c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,18 +66,18 @@ class EasyWorshipSongImport(SongImport):
# 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').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.log_error(self.import_source, translate('SongsPlugin.EasyWorshipSongImport', self.logError(self.importSource, translate('SongsPlugin.EasyWorshipSongImport',
'This file does not exist.')) 'This file does not exist.'))
return return
return return
if not os.path.isfile(import_source_mb): if not os.path.isfile(import_source_mb):
self.log_error(self.import_source, translate('SongsPlugin.EasyWorshipSongImport', self.logError(self.importSource, translate('SongsPlugin.EasyWorshipSongImport',
'Could not find the "Songs.MB" file. It must be in the same ' 'Could not find the "Songs.MB" file. It must be in the same '
'folder as the "Songs.DB" file.')) '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.log_error(self.import_source, translate('SongsPlugin.EasyWorshipSongImport', self.logError(self.importSource, translate('SongsPlugin.EasyWorshipSongImport',
'This file is no valid EasyWorship Database.')) 'This file is no valid EasyWorship Database.'))
return return
db_file = open(self.importSource, 'rb') db_file = open(self.importSource, 'rb')
@ -88,7 +88,7 @@ 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.log_error(self.import_source, translate('SongsPlugin.EasyWorshipSongImport', self.logError(self.importSource, translate('SongsPlugin.EasyWorshipSongImport',
'This file is no valid EasyWorship Database.')) 'This file is no valid EasyWorship Database.'))
return return
# Take a stab at how text is encoded # Take a stab at how text is encoded