forked from openlp/openlp
Make csv-bible import work with python3. Fixes bug 1421136.
Fixes: https://launchpad.net/bugs/1421136
This commit is contained in:
parent
12a0b8b750
commit
5795e386d4
|
@ -73,7 +73,7 @@ class CSVBible(BibleDB):
|
||||||
"""
|
"""
|
||||||
log.info(self.__class__.__name__)
|
log.info(self.__class__.__name__)
|
||||||
BibleDB.__init__(self, parent, **kwargs)
|
BibleDB.__init__(self, parent, **kwargs)
|
||||||
self.books_file = kwargs['books_file']
|
self.books_file = kwargs['booksfile']
|
||||||
self.verses_file = kwargs['versefile']
|
self.verses_file = kwargs['versefile']
|
||||||
|
|
||||||
def do_import(self, bible_name=None):
|
def do_import(self, bible_name=None):
|
||||||
|
@ -93,23 +93,20 @@ class CSVBible(BibleDB):
|
||||||
# Populate the Tables
|
# Populate the Tables
|
||||||
try:
|
try:
|
||||||
details = get_file_encoding(self.books_file)
|
details = get_file_encoding(self.books_file)
|
||||||
books_file = open(self.books_file, 'r')
|
books_file = open(self.books_file, 'r', encoding=details['encoding'])
|
||||||
if not books_file.read(3) == '\xEF\xBB\xBF':
|
|
||||||
# no BOM was found
|
|
||||||
books_file.seek(0)
|
|
||||||
books_reader = csv.reader(books_file, delimiter=',', quotechar='"')
|
books_reader = csv.reader(books_file, delimiter=',', quotechar='"')
|
||||||
for line in books_reader:
|
for line in books_reader:
|
||||||
if self.stop_import_flag:
|
if self.stop_import_flag:
|
||||||
break
|
break
|
||||||
self.wizard.increment_progress_bar(translate('BiblesPlugin.CSVBible', 'Importing books... %s') %
|
self.wizard.increment_progress_bar(translate('BiblesPlugin.CSVBible', 'Importing books... %s')
|
||||||
str(line[2], details['encoding']))
|
% line[2])
|
||||||
book_ref_id = self.get_book_ref_id_by_name(str(line[2], details['encoding']), 67, language_id)
|
book_ref_id = self.get_book_ref_id_by_name(line[2], 67, language_id)
|
||||||
if not book_ref_id:
|
if not book_ref_id:
|
||||||
log.error('Importing books from "%s" failed' % self.books_file)
|
log.error('Importing books from "%s" failed' % self.books_file)
|
||||||
return False
|
return False
|
||||||
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
|
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
|
||||||
self.create_book(str(line[2], details['encoding']), book_ref_id, book_details['testament_id'])
|
self.create_book(line[2], book_ref_id, book_details['testament_id'])
|
||||||
book_list[int(line[0])] = str(line[2], details['encoding'])
|
book_list[int(line[0])] = line[2]
|
||||||
self.application.process_events()
|
self.application.process_events()
|
||||||
except (IOError, IndexError):
|
except (IOError, IndexError):
|
||||||
log.exception('Loading books from file failed')
|
log.exception('Loading books from file failed')
|
||||||
|
@ -125,10 +122,7 @@ class CSVBible(BibleDB):
|
||||||
try:
|
try:
|
||||||
book_ptr = None
|
book_ptr = None
|
||||||
details = get_file_encoding(self.verses_file)
|
details = get_file_encoding(self.verses_file)
|
||||||
verse_file = open(self.verses_file, 'rb')
|
verse_file = open(self.verses_file, 'r', encoding=details['encoding'])
|
||||||
if not verse_file.read(3) == '\xEF\xBB\xBF':
|
|
||||||
# no BOM was found
|
|
||||||
verse_file.seek(0)
|
|
||||||
verse_reader = csv.reader(verse_file, delimiter=',', quotechar='"')
|
verse_reader = csv.reader(verse_file, delimiter=',', quotechar='"')
|
||||||
for line in verse_reader:
|
for line in verse_reader:
|
||||||
if self.stop_import_flag:
|
if self.stop_import_flag:
|
||||||
|
@ -136,7 +130,7 @@ class CSVBible(BibleDB):
|
||||||
try:
|
try:
|
||||||
line_book = book_list[int(line[0])]
|
line_book = book_list[int(line[0])]
|
||||||
except ValueError:
|
except ValueError:
|
||||||
line_book = str(line[0], details['encoding'])
|
line_book = line[0]
|
||||||
if book_ptr != line_book:
|
if book_ptr != line_book:
|
||||||
book = self.get_book(line_book)
|
book = self.get_book(line_book)
|
||||||
book_ptr = book.name
|
book_ptr = book.name
|
||||||
|
@ -144,10 +138,7 @@ class CSVBible(BibleDB):
|
||||||
translate('BiblesPlugin.CSVBible',
|
translate('BiblesPlugin.CSVBible',
|
||||||
'Importing verses from %s...' % book.name, 'Importing verses from <book name>...'))
|
'Importing verses from %s...' % book.name, 'Importing verses from <book name>...'))
|
||||||
self.session.commit()
|
self.session.commit()
|
||||||
try:
|
verse_text = line[3]
|
||||||
verse_text = str(line[3], details['encoding'])
|
|
||||||
except UnicodeError:
|
|
||||||
verse_text = str(line[3], 'cp1252')
|
|
||||||
self.create_verse(book.id, line[1], line[2], verse_text)
|
self.create_verse(book.id, line[1], line[2], verse_text)
|
||||||
self.wizard.increment_progress_bar(translate('BiblesPlugin.CSVBible', 'Importing verses... done.'))
|
self.wizard.increment_progress_bar(translate('BiblesPlugin.CSVBible', 'Importing verses... done.'))
|
||||||
self.application.process_events()
|
self.application.process_events()
|
||||||
|
@ -170,7 +161,7 @@ def get_file_encoding(filename):
|
||||||
"""
|
"""
|
||||||
detect_file = None
|
detect_file = None
|
||||||
try:
|
try:
|
||||||
detect_file = open(filename, 'r')
|
detect_file = open(filename, 'rb')
|
||||||
details = chardet.detect(detect_file.read(1024))
|
details = chardet.detect(detect_file.read(1024))
|
||||||
except IOError:
|
except IOError:
|
||||||
log.exception('Error detecting file encoding')
|
log.exception('Error detecting file encoding')
|
||||||
|
|
Loading…
Reference in New Issue