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

Use generated exceptions instead to make more specific errors.

Browse Source
This commit is contained in:
Mattias Põldaru 2011-12-15 13:53:51 +02:00
parent 95147c996b
commit 235e8c6fcf
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/plugins/songs/lib/openlyricsimport.py
View File

@ -70,6 +70,9 @@ class OpenLyricsImport(SongImport):
parsed_file = etree.parse(open(file_path, u'r'), parser) parsed_file = etree.parse(open(file_path, u'r'), parser)
xml = unicode(etree.tostring(parsed_file)) xml = unicode(etree.tostring(parsed_file))
self.openLyrics.xml_to_song(xml) self.openLyrics.xml_to_song(xml)
except etree.XMLSyntaxError, AttributeError: except etree.XMLSyntaxError:
log.exception(u'XML syntax error in file %s' % file_path) log.exception(u'XML syntax error in file %s' % file_path)
self.logError(file_path, SongStrings.XMLSyntaxError) self.logError(file_path, SongStrings.XMLSyntaxError)
except Exception as values:
log.exception(u'%s in file %s' % (values[0], file_path))
self.logError(file_path, SongStrings.XMLSyntaxError)

9
openlp/plugins/songs/lib/xml.py
View File

@ -673,9 +673,16 @@ class OpenLyrics(object):
sxml = SongXML() sxml = SongXML()
verses = {} verses = {}
verse_def_list = [] verse_def_list = []
try:
lyrics = song_xml.lyrics lyrics = song_xml.lyrics
except AttributeError:
raise Exception('XML error, missing lyrics item')
try:
verses = lyrics.verse
except AttributeError:
raise Exception('XML error, missing verse item')
# Loop over the "verse" elements. # Loop over the "verse" elements.
for verse in lyrics.verse: for verse in verses:
text = u'' text = u''
# Loop over the "lines" elements. # Loop over the "lines" elements.
for lines in verse.lines: for lines in verse.lines: