ouczbs/anki-word-query
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixes.

Browse Source
This commit is contained in:
St.Huang 2018-07-27 10:55:41 +08:00
parent 18930f6778
commit 7d23cc4bf5
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fastwq/gui/progress.py
View File

@ -47,7 +47,6 @@ class ProgressWindow(object):
self.app = QtGui.QApplication.instance() self.app = QtGui.QApplication.instance()
self._win = None self._win = None
self._msg_count = defaultdict(int) self._msg_count = defaultdict(int)
self._last_number_info = u''
self._last_update = 0 self._last_update = 0
self._first_time = 0 self._first_time = 0
self._disabled = False self._disabled = False
@ -74,10 +73,6 @@ class ProgressWindow(object):
fails_number fails_number
) )
if self._last_number_info == number_info:
return
self._last_number_info = number_info
self._update(label=number_info, value=words_number+skips_number+fails_number) self._update(label=number_info, value=words_number+skips_number+fails_number)
self._win.adjustSize() self._win.adjustSize()

21
src/fastwq/query/worker.py
View File

@ -99,7 +99,8 @@ class QueryWorkerManager(object):
def start(self): def start(self):
self.total = self.queue.qsize() self.total = self.queue.qsize()
self.progress.start(self.total, min=0) self.progress.start(max=self.total, min=0)
self.update_progress()
if self.total > 1: if self.total > 1:
for _ in range(0, min(config.thread_number, self.total)): for _ in range(0, min(config.thread_number, self.total)):
self.get_worker() self.get_worker()
@ -109,6 +110,7 @@ class QueryWorkerManager(object):
else: else:
worker = self.get_worker() worker = self.get_worker()
worker.run() worker.run()
self.update_progress()
def update(self, note, results, success_num, missed_css): def update(self, note, results, success_num, missed_css):
self.mutex.lock() self.mutex.lock()
@ -128,6 +130,16 @@ class QueryWorkerManager(object):
self.handle_flush(note) self.handle_flush(note)
return False return False
def update_progress(self):
self.progress.update_labels(MapDict(
type='count',
words_number=self.counter,
skips_number=self.skips,
fails_number=self.fails,
fields_number=self.fields
))
mw.app.processEvents()
def join(self): def join(self):
for worker in self.workers: for worker in self.workers:
while not worker.finished: while not worker.finished:
@ -135,12 +147,7 @@ class QueryWorkerManager(object):
worker.exit = True worker.exit = True
break break
else: else:
self.progress.update_labels(MapDict( self.update_progress()
type='count',
words_number=self.counter,
skips_number=self.skips,
fails_number=self.fails,
fields_number=self.fields))
mw.app.processEvents() mw.app.processEvents()
worker.wait(100) worker.wait(100)
self.progress.finish() self.progress.finish()