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

Fix for bug:1020915 OpenSong Bible import has uncaught exception on non-xml file

This commit is contained in:
Philip Ridout 2012-07-20 20:25:55 +01:00
parent 08c258a9f1
commit 73ad78e3ad
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/plugins/bibles/lib/opensong.py
View File

@ -27,9 +27,10 @@
###############################################################################
import logging
from lxml import objectify
from lxml import etree, objectify
from openlp.core.lib import Receiver, translate
from openlp.core.lib.ui import critical_error_message_box
from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
log = logging.getLogger(__name__)
@ -113,6 +114,13 @@ class OpenSongBible(BibleDB):
(db_book.name, int(chapter.attrib[u'n'].split()[-1])))
self.session.commit()
Receiver.send_message(u'openlp_process_events')
except etree.XMLSyntaxError as inst:
critical_error_message_box(
message=translate('BiblesPlugin.OpenSongImport',
'Incorrect bible file type supplied. OpenSong bibles may be '
'compressed. You must decompress them before import.'))
log.exception(inst)
success = False
except (IOError, AttributeError):
log.exception(u'Loading bible from OpenSong file failed')
success = False