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

Make sure songbeamer songs are decoded correctly

Browse Source
This commit is contained in:
Simon Hanna 2017-03-13 13:16:12 +01:00
parent e5abad85a7
commit 172625b193
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/plugins/songs/lib/importers/songbeamer.py
View File

@ -22,8 +22,6 @@
""" """
The :mod:`songbeamer` module provides the functionality for importing SongBeamer songs into the OpenLP database. The :mod:`songbeamer` module provides the functionality for importing SongBeamer songs into the OpenLP database.
""" """
import chardet
import codecs
import logging import logging
import os import os
import re import re
@ -119,7 +117,7 @@ class SongBeamerImport(SongImport):
# The encoding should only be ANSI (cp1252), UTF-8, Unicode, Big-Endian-Unicode. # The encoding should only be ANSI (cp1252), UTF-8, Unicode, Big-Endian-Unicode.
# So if it doesn't start with 'u' we default to cp1252. See: # So if it doesn't start with 'u' we default to cp1252. See:
# https://forum.songbeamer.com/viewtopic.php?p=419&sid=ca4814924e37c11e4438b7272a98b6f2 # https://forum.songbeamer.com/viewtopic.php?p=419&sid=ca4814924e37c11e4438b7272a98b6f2
if self.input_file_encoding.lower().startswith('u'): if not self.input_file_encoding.lower().startswith('u'):
self.input_file_encoding = 'cp1252' self.input_file_encoding = 'cp1252'
infile = open(import_file, 'rt', encoding=self.input_file_encoding) infile = open(import_file, 'rt', encoding=self.input_file_encoding)
song_data = infile.readlines() song_data = infile.readlines()