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

added fallback to retieve_windows encoding

Browse Source
This commit is contained in:
Philip Ridout 2013-08-13 21:51:52 +01:00
parent 961d70b836
commit 1fb0048def
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
openlp/plugins/songs/lib/songshowplusimport.py
View File

@ -135,41 +135,41 @@ class SongShowPlusImport(SongImport):
log.debug(length_descriptor_size) log.debug(length_descriptor_size)
data = song_data.read(length_descriptor) data = song_data.read(length_descriptor)
if block_key == TITLE: if block_key == TITLE:
self.title = unicode(data, chardet.detect(data)['encoding']) self.title = self.decode(data)
elif block_key == AUTHOR: elif block_key == AUTHOR:
authors = data.split(" / ") authors = data.split(" / ")
for author in authors: for author in authors:
if author.find(",") !=-1: if author.find(",") !=-1:
authorParts = author.split(", ") authorParts = author.split(", ")
author = authorParts[1] + " " + authorParts[0] author = authorParts[1] + " " + authorParts[0]
self.parse_author(unicode(author, chardet.detect(data)['encoding'])) self.parse_author(self.decode(author))
elif block_key == COPYRIGHT: elif block_key == COPYRIGHT:
self.addCopyright(unicode(data, chardet.detect(data)['encoding'])) self.addCopyright(self.decode(data))
elif block_key == CCLI_NO: elif block_key == CCLI_NO:
self.ccliNumber = int(data) self.ccliNumber = int(data)
elif block_key == VERSE: elif block_key == VERSE:
self.addVerse(unicode(data, chardet.detect(data)['encoding']), "%s%s" % (VerseType.tags[VerseType.Verse], verse_no)) self.addVerse(self.decode(data), "%s%s" % (VerseType.tags[VerseType.Verse], verse_no))
elif block_key == CHORUS: elif block_key == CHORUS:
self.addVerse(unicode(data, chardet.detect(data)['encoding']), "%s%s" % (VerseType.tags[VerseType.Chorus], verse_no)) self.addVerse(self.decode(data), "%s%s" % (VerseType.tags[VerseType.Chorus], verse_no))
elif block_key == BRIDGE: elif block_key == BRIDGE:
self.addVerse(unicode(data, chardet.detect(data)['encoding']), "%s%s" % (VerseType.tags[VerseType.Bridge], verse_no)) self.addVerse(self.decode(data), "%s%s" % (VerseType.tags[VerseType.Bridge], verse_no))
elif block_key == TOPIC: elif block_key == TOPIC:
self.topics.append(unicode(data, chardet.detect(data)['encoding'])) self.topics.append(self.decode(data))
elif block_key == COMMENTS: elif block_key == COMMENTS:
self.comments = unicode(data, chardet.detect(data)['encoding']) self.comments = self.decode(data)
elif block_key == VERSE_ORDER: elif block_key == VERSE_ORDER:
verse_tag = self.to_openlp_verse_tag(data, True) verse_tag = self.to_openlp_verse_tag(data, True)
if verse_tag: if verse_tag:
if not isinstance(verse_tag, unicode): if not isinstance(verse_tag, unicode):
verse_tag = unicode(verse_tag, chardet.detect(data)['encoding']) verse_tag = self.decode(verse_tag)
self.ssp_verse_order_list.append(verse_tag) self.ssp_verse_order_list.append(verse_tag)
elif block_key == SONG_BOOK: elif block_key == SONG_BOOK:
self.songBookName = unicode(data, chardet.detect(data)['encoding']) self.songBookName = self.decode(data)
elif block_key == SONG_NUMBER: elif block_key == SONG_NUMBER:
self.songNumber = ord(data) self.songNumber = ord(data)
elif block_key == CUSTOM_VERSE: elif block_key == CUSTOM_VERSE:
verse_tag = self.to_openlp_verse_tag(verse_name) verse_tag = self.to_openlp_verse_tag(verse_name)
self.addVerse(unicode(data, chardet.detect(data)['encoding']), verse_tag) self.addVerse(self.decode(data), verse_tag)
else: else:
log.debug("Unrecognised blockKey: %s, data: %s" % (block_key, data)) log.debug("Unrecognised blockKey: %s, data: %s" % (block_key, data))
song_data.seek(next_block_starts) song_data.seek(next_block_starts)
@ -207,3 +207,13 @@ class SongShowPlusImport(SongImport):
verse_tag = VerseType.tags[VerseType.Other] verse_tag = VerseType.tags[VerseType.Other]
verse_number = self.other_list[verse_name] verse_number = self.other_list[verse_name]
return verse_tag + verse_number return verse_tag + verse_number
def decode(self, data):
try:
return unicode(data, chardet.detect(data)['encoding'])
except:
while True:
try:
return unicode(data, self.encoding)
except:
self.encoding = retrieve_windows_encoding()