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

code to expand <format> tag for openlyrics export

Browse Source
This commit is contained in:
Martin Zibricky 2011-09-08 01:16:14 +02:00
parent 9fb6936263
commit c8c8c7e654
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,6 +310,8 @@ class OpenLyrics(object):
tags_element = None tags_element = None
match = re.search(u'\{/?\w+\}', song.lyrics, re.UNICODE) match = re.search(u'\{/?\w+\}', song.lyrics, re.UNICODE)
if match: if match:
# reset available tags
FormattingTags.reset_html_tags()
# named 'formatting' - 'format' is built-in fuction in Python # named 'formatting' - 'format' is built-in fuction in Python
formatting = etree.SubElement(song_xml, u'format') formatting = etree.SubElement(song_xml, u'format')
tags_element = etree.SubElement(formatting, u'tags') tags_element = etree.SubElement(formatting, u'tags')
@ -398,12 +400,32 @@ class OpenLyrics(object):
parent.append(element) parent.append(element)
return element return element
def _add_tag_to_formatting(self, tag_name, tags_element):
print '------'
available_tags = FormattingTags.get_html_tags()
start_tag = '{%s}' % tag_name
for t in available_tags:
if t[u'start tag'] == start_tag:
# create new formatting tag in openlyrics xml
el = self._add_text_to_element(u'tag', tags_element)
el.set(u'name', tag_name)
el_open = self._add_text_to_element(u'open', el)
el_close = self._add_text_to_element(u'close', el)
el_open.text = etree.CDATA(t[u'start html'])
el_close.text = etree.CDATA(t[u'end html'])
def _add_line_with_tags_to_lines(self, parent, text, tags_element): def _add_line_with_tags_to_lines(self, parent, text, tags_element):
# tags already converted to xml structure
xml_tags = tags_element.xpath(u'tag/attribute::name')
start_tags = self.start_tags_regex.findall(text) start_tags = self.start_tags_regex.findall(text)
end_tags = self.end_tags_regex.findall(text) end_tags = self.end_tags_regex.findall(text)
# replace start tags with xml syntax # replace start tags with xml syntax
for t in start_tags: for tag in start_tags:
text = text.replace(t, u'<tag name="%s">' % t[1:-1]) name = tag[1:-1]
text = text.replace(tag, u'<tag name="%s">' % name)
# add tag to <format> elment if tag not present
if name not in xml_tags:
self._add_tag_to_formatting(name, tags_element)
# replace end tags # replace end tags
for t in end_tags: for t in end_tags:
text = text.replace(t, u'</tag>') text = text.replace(t, u'</tag>')

2
testing/test_openlyrics.py
View File

@ -46,7 +46,7 @@ def test_openlyrics_export(songs_db, openlyrics_validator, pth, tmpdir):
tree.write(open(f.strpath, u'w'), encoding=u'utf-8', xml_declaration=True, tree.write(open(f.strpath, u'w'), encoding=u'utf-8', xml_declaration=True,
pretty_print=True) pretty_print=True)
# validate file # validate file
#assert openlyrics_validator.validate(f.strpath) == True assert openlyrics_validator.validate(f.strpath) == True
# string comparison with original file line by line # string comparison with original file line by line
f_orig = pth.songs.join('openlyrics_test_1.xml') f_orig = pth.songs.join('openlyrics_test_1.xml')
for l, l_orig in zip(f.readlines(), f_orig.readlines()): for l, l_orig in zip(f.readlines(), f_orig.readlines()):