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

Fallback to manual encoding detection.

This commit is contained in:
Tomas Groth 2015-01-29 21:15:39 +00:00
parent 4c53cb5184
commit 1b75cc9c6b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ Presentationmanager song files into the current database.
""" """
import os import os
import chardet
from lxml import objectify, etree from lxml import objectify, etree
from openlp.core.ui.wizard import WizardStrings from openlp.core.ui.wizard import WizardStrings
@ -42,7 +43,13 @@ class PresentationManagerImport(SongImport):
if self.stop_import_flag: if self.stop_import_flag:
return return
self.import_wizard.increment_progress_bar(WizardStrings.ImportingType % os.path.basename(file_path)) self.import_wizard.increment_progress_bar(WizardStrings.ImportingType % os.path.basename(file_path))
tree = etree.parse(file_path, parser=etree.XMLParser(recover=True)) try:
tree = etree.parse(file_path, parser=etree.XMLParser(recover=True))
except etree.XMLSyntaxError:
# Try to detect encoding and use it
file = open(file_path, mode='rb')
encoding = chardet.detect(file)['encoding']
tree = etree.parse(file_path, parser=etree.XMLParser(recover=True, encoding=encoding))
root = objectify.fromstring(etree.tostring(tree)) root = objectify.fromstring(etree.tostring(tree))
self.process_song(root) self.process_song(root)

8
tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py
View File

@ -42,9 +42,9 @@ class TestPresentationManagerFileImport(SongImportTestHelper):
""" """
Test that loading a PresentationManager file works correctly Test that loading a PresentationManager file works correctly
""" """
#self.file_import([os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.sng')], self.file_import([os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.sng')],
# self.load_external_result_data(os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.json'))) self.load_external_result_data(os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.json')))
#self.file_import([os.path.join(TEST_PATH, 'Agnus Dei.sng')], self.file_import([os.path.join(TEST_PATH, 'Agnus Dei.sng')],
# self.load_external_result_data(os.path.join(TEST_PATH, 'Agnus Dei.json'))) self.load_external_result_data(os.path.join(TEST_PATH, 'Agnus Dei.json')))
self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.sng')], self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.sng')],
self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json'))) self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json')))