openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

fix #99

This commit is contained in:
Mattias Põldaru 2011-02-21 17:16:56 +02:00
parent f6cc197e19
commit 7d7f9a7d98
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openlp/plugins/songs/lib/cclifileimport.py
View File

@ -78,7 +78,20 @@ class CCLIFileImport(SongImport):
details = chardet.detect(detect_content)
detect_file.close()
infile = codecs.open(filename, u'r', details['encoding'])
lines = infile.readlines()
try:
lines = infile.readlines()
infile.close()
except UnicodeDecodeError:
# First 2kB were not sufficient to detect file encoding.
# This time we read entire file.
detect_file = open(filename, u'r')
detect_content = detect_file.read()
details = chardet.detect(detect_content)
detect_file.close()
# We read the contents again. Should it be a try as well?
infile = codecs.open(filename, u'r', details['encoding'])
lines = infile.readlines()
infile.close()
ext = os.path.splitext(filename)[1]
if ext.lower() == u'.usr':
log.info(u'SongSelect .usr format file found %s: ',