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

Remove 'recover=True' to see if that fixes the problem with extra elements that mess the parser up

Browse Source
This commit is contained in:
Raoul Snyman 2019-03-26 14:20:15 -07:00
parent ce8996c8b9
commit fb3f5ca0b4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/plugins/songs/lib/importers/presentationmanager.py
View File

@ -45,16 +45,15 @@ class PresentationManagerImport(SongImport):
return
self.import_wizard.increment_progress_bar(WizardStrings.ImportingType.format(source=file_path.name))
try:
tree = etree.parse(str(file_path), parser=etree.XMLParser(recover=True))
tree = etree.parse(str(file_path), parser=etree.XMLParser())
except etree.XMLSyntaxError:
# Try to detect encoding and use it
encoding = get_file_encoding(file_path)['encoding']
# Open file with detected encoding and remove encoding declaration
text = file_path.read_text(encoding=encoding)
print(text)
text = re.sub(r'.+\?>\n', '', text)
try:
tree = etree.fromstring(text, parser=etree.XMLParser(recover=True))
tree = etree.fromstring(text, parser=etree.XMLParser())
except ValueError:
self.log_error(file_path,
translate('SongsPlugin.PresentationManagerImport',