oadmin/steamreg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改邮箱API使用逻辑，限制每次注册流程只获取一个邮箱账号

Browse Source
This commit is contained in:
hkyc
2025-05-22 22:59:52 +08:00
parent 76270b6834
commit 91c0b6202d
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ThreadManagerWithPyno.py
View File

@@ -2,6 +2,7 @@ from concurrent.futures import ThreadPoolExecutor
import json
import os
import threading
import time
from ProxyPool import ProxyPool
from SteamRegistrationWithPyno import SteamRegistrationWithPyno
from EmailAPIClient import EmailAPIClient
@@ -81,10 +82,12 @@ class ThreadManagerWithPyno:
registration.main(email_data)
def get_email_from_api(self):
"""从API获取邮箱账号"""
"""从API获取邮箱账号 - 每次只获取一个"""
try:
print("从API获取单个邮箱账号...")
email_data = self.email_api_client.get_email_credentials()
if email_data:
print(f"获取到邮箱: {email_data['email']}")
return email_data
except Exception as e:
print(f"从API获取邮箱失败: {e}")
@@ -117,13 +120,13 @@ class ThreadManagerWithPyno:
self._running = True
try:
if self.email_source == "api":
# 使用API获取邮箱
while self._running and (self.reg_count == 0 or self.processed_count < self.reg_count):
email_data = self.get_email_from_api()
if not email_data:
print("无法从API获取邮箱，任务停止")
break
self.executor.submit(self.process_email, email_data)
# 使用API获取邮箱 - 只获取一个
email_data = self.get_email_from_api()
if not email_data:
print("无法从API获取邮箱，任务停止")
return
# 处理单个邮箱
self.process_email(email_data)
else:
# 使用本地文件获取邮箱
with open(self.email_file, "r", encoding="utf-8") as file:
@@ -188,19 +191,18 @@ class GUIThreadManagerWithPyno(ThreadManagerWithPyno):
try:
if self.email_source == "api":
# 使用API获取邮箱
with ThreadPoolExecutor(max_workers=self.config['executornum']) as self.executor:
while self._running and (self.reg_count == 0 or self.processed_count < self.reg_count):
email_data = self.get_email_from_api()
if not email_data:
self.gui.update_status("API错误", "无法从API获取邮箱", result="失败")
break
# 使用API获取单个邮箱
self.gui.update_status("系统消息", "正在从API获取邮箱...")
email_data = self.get_email_from_api()
if not email_data:
self.gui.update_status("API错误", "无法从API获取邮箱", result="失败")
return
# 跳过已完成的任务
if email_data['email'] not in self.completed_tasks:
self.executor.submit(self.process_email, email_data)
else:
print(f"跳过已完成的邮箱: {email_data['email']}")
# 处理单个邮箱，不使用线程池
if email_data['email'] not in self.completed_tasks:
self.process_email(email_data)
else:
self.gui.update_status(email_data['email'], "邮箱已处理过，跳过", result="跳过")
else:
# 使用本地文件获取邮箱
with open(self.email_file, 'r', encoding='utf-8') as file: