A fix to the OSIS importer, and added the version file.

This commit is contained in:
Raoul Snyman 2010-02-28 22:50:14 +02:00
parent 69af99f5dc
commit e37ab565ad
3 changed files with 8 additions and 3 deletions

View File

@ -32,6 +32,7 @@ from logging import FileHandler
from optparse import OptionParser
from PyQt4 import QtCore, QtGui
import openlp
from openlp.core.lib import Receiver, str_to_bool
from openlp.core.resources import qInitResources
from openlp.core.ui import MainWindow, SplashScreen, ScreenList
@ -77,8 +78,8 @@ class OpenLP(QtGui.QApplication):
Run the OpenLP application.
"""
#Load and store current Application Version
filepath = os.path.split(os.path.abspath(__file__))[0]
filepath = os.path.abspath(os.path.join(filepath, u'version.txt'))
filepath = os.path.split(os.path.abspath(openlp.__file__))[0]
filepath = os.path.abspath(os.path.join(filepath, u'.version'))
fversion = None
try:
fversion = open(filepath, u'r')

1
openlp/.version Normal file
View File

@ -0,0 +1 @@
1.9.0-bzr718

View File

@ -30,6 +30,8 @@ import chardet
import codecs
import re
from PyQt4 import QtCore
from openlp.core.lib import Receiver
from db import BibleDB
@ -94,10 +96,11 @@ class OSISBible(BibleDB):
Loads a Bible from file.
"""
log.debug(u'Starting OSIS import from "%s"' % self.filename)
self.wizard.incrementProgressBar(u'Detecting encoding (this may take a few minutes)...')
detect_file = None
try:
detect_file = open(self.filename, u'r')
details = chardet.detect(detect_file.read(3000))
details = chardet.detect(detect_file.read())
except:
log.exception(u'Failed to detect OSIS file encoding')
return