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 #6576 (Adding to epub files to library from a connected folder)

Browse Source
This commit is contained in:
Kovid Goyal 2010-08-26 14:45:00 -06:00
parent ead6a72a46
commit df3208a4b5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/gui2/add.py
View File

@ -280,19 +280,17 @@ class Adder(QObject): # {{{
self.pd.set_min(0) self.pd.set_min(0)
self.pd.set_max(len(self.ids)) self.pd.set_max(len(self.ids))
self.pd.value = 0 self.pd.value = 0
self.timer = QTimer(self)
self.db_adder = DBAdder(self.db, self.ids, self.nmap) self.db_adder = DBAdder(self.db, self.ids, self.nmap)
self.db_adder.start() self.db_adder.start()
self.connect(self.timer, SIGNAL('timeout()'), self.update)
self.last_added_at = time.time() self.last_added_at = time.time()
self.entry_count = len(self.ids) self.entry_count = len(self.ids)
self.timer.start(200) self.continue_updating = True
QTimer.singleShot(200, self.update)
def canceled(self): def canceled(self):
self.continue_updating = False
if self.rfind is not None: if self.rfind is not None:
self.rfind.canceled = True self.rfind.canceled = True
if self.timer is not None:
self.timer.stop()
if self.worker is not None: if self.worker is not None:
self.worker.canceled = True self.worker.canceled = True
if hasattr(self, 'db_adder'): if hasattr(self, 'db_adder'):
@ -312,7 +310,7 @@ class Adder(QObject): # {{{
def update(self): def update(self):
if self.entry_count <= 0: if self.entry_count <= 0:
self.timer.stop() self.continue_updating = False
self.pd.hide() self.pd.hide()
self.process_duplicates() self.process_duplicates()
return return
@ -334,18 +332,21 @@ class Adder(QObject): # {{{
pass pass
if (time.time() - self.last_added_at) > self.ADD_TIMEOUT: if (time.time() - self.last_added_at) > self.ADD_TIMEOUT:
self.timer.stop() self.continue_updating = False
self.pd.hide() self.pd.hide()
self.db_adder.end = True self.db_adder.end = True
if not self.callback_called: if not self.callback_called:
self.callback([], [], []) self.callback([], [], [])
self.callback_called = True self.callback_called = True
error_dialog(self._parent, _('Adding failed'), error_dialog(self._parent, _('Adding failed'),
_('The add books process seems to have hung.' _('The add books process seems to have hung.'
' Try restarting calibre and adding the ' ' Try restarting calibre and adding the '
'books in smaller increments, until you ' 'books in smaller increments, until you '
'find the problem book.'), show=True) 'find the problem book.'), show=True)
if not self.continue_updating:
QTimer.singleShot(200, self.update)
def process_duplicates(self): def process_duplicates(self):
duplicates = self.db_adder.duplicates duplicates = self.db_adder.duplicates