mirror of
https://github.com/ankitects/anki.git
synced 2025-11-06 12:47:11 -05:00
Simplify sync progress update by scaling to KB, fix CONTRIBUTORS
This commit is contained in:
parent
c6a7079dc1
commit
aa4e47f884
2 changed files with 4 additions and 17 deletions
|
|
@ -243,14 +243,11 @@ Lee Doughty <32392044+leedoughty@users.noreply.github.com>
|
|||
memchr <memchr@proton.me>
|
||||
Max Romanowski <maxr777@proton.me>
|
||||
Aldlss <ayaldlss@gmail.com>
|
||||
<<<<<<< HEAD
|
||||
Hanna Nilsén <hanni614@student.liu.se>
|
||||
Elias Johansson Lara <elias.johanssonlara@gmail.com>
|
||||
Toby Penner <tobypenner01@gmail.com>
|
||||
Danilo Spillebeen <spillebeendanilo@gmail.com>
|
||||
Matbe766 <matildabergstrom01@gmail.com
|
||||
|
||||
>>>>>>> fcd53376f (qt: normalize large progress totals to kilobytes to avoid QProgressBar overflow (#4341); docs: update CONTRIBUTORS)
|
||||
Matbe766 <matildabergstrom01@gmail.com>
|
||||
|
||||
|
||||
********************
|
||||
|
|
|
|||
|
|
@ -213,22 +213,12 @@ def on_full_sync_timer(mw: aqt.main.AnkiQt, label: str) -> None:
|
|||
if sync_progress.transferred == sync_progress.total:
|
||||
label = tr.sync_checking()
|
||||
|
||||
INT32_MAX = 2_147_483_647
|
||||
total = sync_progress.total
|
||||
transferred = sync_progress.transferred
|
||||
|
||||
# Unknown/zero total -> indeterminate spinner (0..0)
|
||||
if not total or total <= 0:
|
||||
value_for_bar = None
|
||||
max_for_bar = 0
|
||||
elif total > INT32_MAX: # scale to kB if too large for int32
|
||||
max_for_bar = (total + 1023) // 1024
|
||||
value_for_bar = (transferred + 1023) // 1024
|
||||
value_for_bar = min(value_for_bar, max_for_bar)
|
||||
else:
|
||||
# Small totals -> keep exact bytes
|
||||
max_for_bar = total
|
||||
value_for_bar = min(transferred, total)
|
||||
# Scale both to kilobytes with floor division
|
||||
max_for_bar = total // 1024
|
||||
value_for_bar = transferred // 1024
|
||||
|
||||
mw.progress.update(
|
||||
value=value_for_bar,
|
||||
|
|
|
|||
Loading…
Reference in a new issue