From d305948d509ec87ef8da0144a83baf79b1f97d41 Mon Sep 17 00:00:00 2001 From: break27 Date: Mon, 29 Jun 2026 14:34:19 +0800 Subject: [PATCH] fix: omit counts --- index.html | 4 ++-- main.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index c84522d..8282a33 100644 --- a/index.html +++ b/index.html @@ -448,11 +448,11 @@ while (await new Promise(o => setTimeout(o, 1000, true))) { $('#send').classList.add('pulse'); $('#timezoneLabel').innerText = Temporal.Now.zonedDateTimeISO(locale.timezone).toLocaleString(locale.name); - let { done, skip, orts, email, subject, recipient } = await Rpc2.invoke('progress').catch(() => new Object()); + let { done, skip, omit, email, subject, recipient } = await Rpc2.invoke('progress').catch(() => new Object()); let limit = minor || major - 1; let chunk = $('#chunksize').valueAsNumber; let total = $('#slice').checked ? Math.min(chunk, limit - chunk * $('#offset').valueAsNumber) : limit; - let index = $('#slice').checked ? done + skip - orts : done + skip; + let index = $('#slice').checked ? done + skip - omit : done + skip; $('#progressLabel').innerText = `${parseFloat(index / total * 100).toFixed(2)}% (${index}/${total})`; $('#subjectLabel').innerText = subject ?? ''; diff --git a/main.py b/main.py index e4116ed..db7b47b 100644 --- a/main.py +++ b/main.py @@ -373,7 +373,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')): progress['done'] = 0 progress['skip'] = 0 - progress['orts'] = 0 + progress['omit'] = 0 progress['subject'] = subject logger.info('Done') except Cancel: @@ -410,11 +410,12 @@ def main(driver: Chrome, logger = logging.getLogger('main')): if (sent := cell(index, column.sent).value) is not None and str(sent).strip(): logger.info("[%d/%d] Already visited; skipping '%s'", index-1, limit-1, email) occurrence[code] += 1 + progress['omit'] += 1 raise Skip() if index < options.get('start', 2) or progress['done'] >= options.get('limit', limit): logger.info("[%d/%d] Not planned; skipping '%s'", index-1, limit-1, email) - progress['orts'] += 1 + progress['omit'] += 1 raise Skip() match options.get('occurrence'):