This commit is contained in:
Kovid Goyal 2015-12-10 15:07:13 +05:30
parent bc1c4807f6
commit 8c79949a1d

View File

@ -20,10 +20,12 @@ from calibre import isbytestring, patheq, force_unicode
class ProgressDialog(PD): class ProgressDialog(PD):
on_progress_update = pyqtSignal(object, object, object) on_progress_update = pyqtSignal(object, object, object)
finished_moving = pyqtSignal()
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
PD.__init__(self, *args, **kwargs) PD.__init__(self, *args, **kwargs)
self.on_progress_update.connect(self.progressed, type=Qt.QueuedConnection) self.on_progress_update.connect(self.progressed, type=Qt.QueuedConnection)
self.finished_moving.connect(self.accept, type=Qt.QueuedConnection)
def reject(self): def reject(self):
return return
@ -133,12 +135,12 @@ class ChooseLibrary(QDialog, Ui_Dialog):
move_error = [] move_error = []
def do_move(): def do_move():
try: try:
self.db.new_api.move_library_to(loc, abort=abort_move, progress2=pd.on_progress_update.emit) self.db.new_api.move_library_to(loc, abort=abort_move, progress=pd.on_progress_update.emit)
except Exception: except Exception:
import traceback import traceback
move_error.append(traceback.format_exc()) move_error.append(traceback.format_exc())
finally: finally:
pd.accept() pd.finished_moving.emit()
t = Thread(name='MoveLibrary', target=do_move) t = Thread(name='MoveLibrary', target=do_move)
QTimer.singleShot(0, t.start) QTimer.singleShot(0, t.start)