Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix progress dialog not being updated on windows during move library

Browse Source
This commit is contained in:
Kovid Goyal 2015-12-10 16:31:02 +05:30
parent 4952caec6c
commit c28290be0b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/dialogs/choose_library.py
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
from __future__ import print_function
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
@ -31,11 +32,13 @@ class ProgressDialog(PD):
return return
def progressed(self, item_name, count, total): def progressed(self, item_name, count, total):
if self.max == 0: self.max = total
self.max = total
self.value = count self.value = count
self.set_msg(item_name) self.set_msg(item_name)
def show_new_progress(self, *args):
self.on_progress_update.emit(*args)
class ChooseLibrary(QDialog, Ui_Dialog): class ChooseLibrary(QDialog, Ui_Dialog):
def __init__(self, db, callback, parent): def __init__(self, db, callback, parent):
@ -129,13 +132,13 @@ class ChooseLibrary(QDialog, Ui_Dialog):
# move library # move library
self.db.prefs.disable_setting = True self.db.prefs.disable_setting = True
abort_move = Event() abort_move = Event()
pd = ProgressDialog(_('Moving library, please wait...'), max=0, min=0, icon='lt.png', parent=self.parent()) pd = ProgressDialog(_('Moving library, please wait...'), _('Scanning...'), max=0, min=0, icon='lt.png', parent=self)
pd.canceled_signal.connect(abort_move.set) pd.canceled_signal.connect(abort_move.set)
self.parent().library_view.model().stop_metadata_backup() self.parent().library_view.model().stop_metadata_backup()
move_error = [] move_error = []
def do_move(): def do_move():
try: try:
self.db.new_api.move_library_to(loc, abort=abort_move, progress=pd.on_progress_update.emit) self.db.new_api.move_library_to(loc, abort=abort_move, progress=pd.show_new_progress)
except Exception: except Exception:
import traceback import traceback
move_error.append(traceback.format_exc()) move_error.append(traceback.format_exc())
@ -178,6 +181,6 @@ class ChooseLibrary(QDialog, Ui_Dialog):
_('%s is not an existing folder')%loc, show=True) _('%s is not an existing folder')%loc, show=True)
if not self.check_action(action, loc): if not self.check_action(action, loc):
return return
QDialog.accept(self)
self.location.save_history() self.location.save_history()
self.perform_action(action, loc) self.perform_action(action, loc)
QDialog.accept(self) # Must be after perform action otherwise the progress dialog is not updated on windows