fix: add _processing_uids to prevent re-fetching emails being processed

This commit is contained in:
2026-07-13 07:12:43 +08:00
parent ae140df3fb
commit 02cf4b88b6
2 changed files with 6 additions and 4 deletions

View File

@@ -30,6 +30,7 @@ logger = logging.getLogger("main")
_running = True
_pending_lock = threading.Lock()
_pending_uids: set[bytes] = set()
_processing_uids: set[bytes] = set() # 正在处理含等待TG发送的邮件UID
# Queue 1: raw emails → AI processor
_email_queue: queue_module.Queue = queue_module.Queue()
@@ -51,7 +52,8 @@ def _email_poller(cfg):
if not _running:
return
with _pending_lock:
if mail.uid not in _pending_uids:
if mail.uid not in _processing_uids:
_processing_uids.add(mail.uid)
_pending_uids.add(mail.uid)
_email_queue.put((acct_idx, mail))
except Exception as e:
@@ -90,6 +92,7 @@ def _ai_processor(cfg):
# AI 失败也要移除 pending否则永远卡住
with _pending_lock:
_pending_uids.discard(mail.uid)
_processing_uids.discard(mail.uid)
time.sleep(0.1 if pending_futures else 0.5)
@@ -110,6 +113,7 @@ def _tg_worker(cfg):
# 发送并标记已读成功后才移除 pending
with _pending_lock:
_pending_uids.discard(info["uid"])
_processing_uids.discard(info["uid"])
except queue_module.Empty:
break
except Exception as e:
@@ -118,6 +122,7 @@ def _tg_worker(cfg):
try:
with _pending_lock:
_pending_uids.discard(info["uid"])
_processing_uids.discard(info["uid"])
except Exception:
pass

View File

@@ -163,9 +163,6 @@ def fetch_unseen_emails(account: EmailAccount) -> list[Email]:
emails.append(Email(uid=uid, subject=subject, sender=sender, recipient=recipient,
body=body, date=date_str, reply_to=reply_to, account_email=account.username,
folder=folder))
# FETCH 可能被服务器自动标已读,立即标回未读
conn.uid("STORE", uid, "-FLAGS", "\\Seen")
except Exception as e:
logger.error(" UID %s FETCH 失败,跳过: %s", uid, e)
continue