forked from openlp/openlp
Moved the stop import out of the base class, since Qt doesn't like it.
This commit is contained in:
parent
0374233db6
commit
027d6d3e4e
@ -50,6 +50,15 @@ class CSVBible(BibleDB):
|
|||||||
if u'versesfile' not in kwargs:
|
if u'versesfile' not in kwargs:
|
||||||
raise KeyError(u'You have to supply a file to import verses from.')
|
raise KeyError(u'You have to supply a file to import verses from.')
|
||||||
self.versesfile = kwargs[u'versesfile']
|
self.versesfile = kwargs[u'versesfile']
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'openlpstopimport'), self.stop_import)
|
||||||
|
|
||||||
|
def stop_import(self):
|
||||||
|
"""
|
||||||
|
Stops the import of the Bible.
|
||||||
|
"""
|
||||||
|
log.debug('Stopping import!')
|
||||||
|
self.stop_import = True
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
#Populate the Tables
|
#Populate the Tables
|
||||||
|
@ -29,8 +29,7 @@ import logging
|
|||||||
from sqlalchemy import or_
|
from sqlalchemy import or_
|
||||||
from PyQt4 import QtCore
|
from PyQt4 import QtCore
|
||||||
|
|
||||||
from openlp.core.lib import Receiver
|
from openlp.plugins.bibles.lib.models import *
|
||||||
from models import *
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -92,18 +91,9 @@ class BibleDB():
|
|||||||
may want to override this method to supply their own custom
|
may want to override this method to supply their own custom
|
||||||
initialisation as well.
|
initialisation as well.
|
||||||
"""
|
"""
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
|
||||||
QtCore.SIGNAL(u'openlpstopimport'), self.stop_import)
|
|
||||||
self.create_tables()
|
self.create_tables()
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
def stop_import(self):
|
|
||||||
"""
|
|
||||||
Stops the import of the Bible.
|
|
||||||
"""
|
|
||||||
log.debug('Stopping import!')
|
|
||||||
self.stop_import = True
|
|
||||||
|
|
||||||
def commit(self):
|
def commit(self):
|
||||||
log.debug('Committing...')
|
log.debug('Committing...')
|
||||||
self.session.commit()
|
self.session.commit()
|
||||||
|
@ -52,6 +52,15 @@ class OpenSongBible(BibleDB):
|
|||||||
if u'filename' not in kwargs:
|
if u'filename' not in kwargs:
|
||||||
raise KeyError(u'You have to supply a file name to import from.')
|
raise KeyError(u'You have to supply a file name to import from.')
|
||||||
self.filename = kwargs[u'filename']
|
self.filename = kwargs[u'filename']
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'openlpstopimport'), self.stop_import)
|
||||||
|
|
||||||
|
def stop_import(self):
|
||||||
|
"""
|
||||||
|
Stops the import of the Bible.
|
||||||
|
"""
|
||||||
|
log.debug('Stopping import!')
|
||||||
|
self.stop_import = True
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
"""
|
"""
|
||||||
|
@ -81,6 +81,15 @@ class OSISBible(BibleDB):
|
|||||||
finally:
|
finally:
|
||||||
if fbibles:
|
if fbibles:
|
||||||
fbibles.close()
|
fbibles.close()
|
||||||
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
|
QtCore.SIGNAL(u'openlpstopimport'), self.stop_import)
|
||||||
|
|
||||||
|
def stop_import(self):
|
||||||
|
"""
|
||||||
|
Stops the import of the Bible.
|
||||||
|
"""
|
||||||
|
log.debug('Stopping import!')
|
||||||
|
self.stop_import = True
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user