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

Fix unicode skip issue with the strip_rtf function.

Browse Source 
Add doc comment to EasyWorship6 import method.
This commit is contained in:
Gary Talent 2016-09-20 22:10:28 -05:00
parent 5435dfc5cc
commit 08416db1d3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp/plugins/songs/lib/__init__.py
View File

@ -512,10 +512,13 @@ def strip_rtf(text, default_encoding=None):
elif not ignorable: elif not ignorable:
ebytes.append(int(hex_, 16)) ebytes.append(int(hex_, 16))
elif tchar: elif tchar:
if curskip > 0: if not ignorable:
curskip -= 1
elif not ignorable:
ebytes += tchar.encode() ebytes += tchar.encode()
if len(ebytes) >= curskip:
ebytes = ebytes[curskip:]
else:
curskip -= len(ebytes)
ebytes = ""
text = ''.join(out) text = ''.join(out)
return text, default_encoding return text, default_encoding

3
openlp/plugins/songs/lib/importers/easyworship.py
View File

@ -341,6 +341,9 @@ class EasyWorshipSongImport(SongImport):
self.memo_file.close() self.memo_file.close()
def import_sqlite_db(self): def import_sqlite_db(self):
"""
Import the songs from an EasyWorship 6 SQLite database
"""
# get database handles # get database handles
songs_conn = sqlite3.connect(self.import_source + "/Databases/Data/Songs.db") songs_conn = sqlite3.connect(self.import_source + "/Databases/Data/Songs.db")
words_conn = sqlite3.connect(self.import_source + "/Databases/Data/SongWords.db") words_conn = sqlite3.connect(self.import_source + "/Databases/Data/SongWords.db")