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

Fix #912 by using the correct argument; Also fix the tests on macOS (and now my machine) where some version of libxml2 has an error that causes syntax errors in the resulting XML

Browse Source
This commit is contained in:
Raoul Snyman 2021-09-05 22:29:43 -07:00
parent f469f0b55b
commit bd6dfb43be
Signed by: raoul
GPG Key ID: F55BCED79626AE9C
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/mediamanageritem.py
View File

@ -594,7 +594,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties, LogMixin):
# multiple service items? # multiple service items?
if self.single_service_item: if self.single_service_item:
self.log_debug('{plugin} Add requested'.format(plugin=self.plugin.name)) self.log_debug('{plugin} Add requested'.format(plugin=self.plugin.name))
self.add_to_service(replace=self.remote_triggered) self.add_to_service(remote=self.remote_triggered)
else: else:
items = self.list_view.selectedIndexes() items = self.list_view.selectedIndexes()
drop_position = self.service_manager.get_drop_position() drop_position = self.service_manager.get_drop_position()

6
openlp/plugins/songs/lib/openlyricsxml.py
View File

@ -675,8 +675,10 @@ class OpenLyrics(object):
""" """
text = '' text = ''
# Convert lxml.objectify to lxml.etree representation. # Convert lxml.objectify to lxml.etree representation.
lines = etree.tostring(lines) string_lines = etree.tostring(lines)
element = etree.XML(lines) # lxml 4.6.x or some recent version of libxml2 seems to add the left-over tags in
string_lines = string_lines.replace('</verse>', '').replace('</lyrics>', '').replace('</song>')
element = etree.XML(string_lines)
# OpenLyrics 0.8 uses <br/> for new lines. Append text from "lines" element to verse text. # OpenLyrics 0.8 uses <br/> for new lines. Append text from "lines" element to verse text.
if version > '0.7': if version > '0.7':