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

do not use re with xml

Browse Source
This commit is contained in:
Andreas Preikschat 2011-08-22 15:39:02 +02:00
parent c7d875a67f
commit 650dc83aeb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,6 @@ from openlp.core.utils import get_application_version
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
CHORD_REGEX = re.compile(u'<chord name=".*?"/>')
class SongXML(object): class SongXML(object):
""" """
This class builds and parses the XML used to describe songs. This class builds and parses the XML used to describe songs.
@ -202,7 +200,7 @@ class OpenLyrics(object):
This property is not supported. This property is not supported.
``<lines>`` ``<lines>``
The attribute *part* is not supported. The *break* attribute is fully The attribute *part* is not supported. The *break* attribute is
supported. supported.
``<publisher>`` ``<publisher>``
@ -339,8 +337,6 @@ class OpenLyrics(object):
return None return None
if xml[:5] == u'<?xml': if xml[:5] == u'<?xml':
xml = xml[38:] xml = xml[38:]
# Remove chords from xml.
xml = CHORD_REGEX.sub(u'', xml)
song_xml = objectify.fromstring(xml) song_xml = objectify.fromstring(xml)
if hasattr(song_xml, u'properties'): if hasattr(song_xml, u'properties'):
properties = song_xml.properties properties = song_xml.properties
@ -479,13 +475,19 @@ class OpenLyrics(object):
verses = {} verses = {}
verse_def_list = [] verse_def_list = []
lyrics = song_xml.lyrics lyrics = song_xml.lyrics
# Loop over the "verse" elements.
for verse in lyrics.verse: for verse in lyrics.verse:
text = u'' text = u''
# Loop over the "lines" elements.
for lines in verse.lines: for lines in verse.lines:
if text: if text:
text += u'\n' text += u'\n'
text += u'\n'.join(map(unicode, lines.line)) # Loop over the "line" elements removing chords.
# Adgetd a virtual split to the verse text. for line in lines.line:
if text:
text += u'\n'
text += u''.join(map(unicode, line.itertext()))
# Add a virtual split to the verse text.
if lines.get(u'break') is not None: if lines.get(u'break') is not None:
text += u'\n[---]' text += u'\n[---]'
verse_def = verse.get(u'name', u' ').lower() verse_def = verse.get(u'name', u' ').lower()