From f87762f5bde6a992fec6d971c35ba63cafab4020 Mon Sep 17 00:00:00 2001 From: break27 Date: Fri, 25 Jul 2025 18:02:45 +0800 Subject: [PATCH] update: removed default timezone --- 邮件批量发送脚本.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/邮件批量发送脚本.py b/邮件批量发送脚本.py index c83ea94..0b3aa1c 100644 --- a/邮件批量发送脚本.py +++ b/邮件批量发送脚本.py @@ -28,7 +28,7 @@ parser.add_argument('-p', '--password', type=str, required=True) parser.add_argument('-t', '--timeout', type=int, nargs='?', default=60) parser.add_argument('-i', '--interval', type=int, nargs='?', default=10) parser.add_argument('-m', '--max-occurrence', type=int, nargs='?', default=5) -parser.add_argument('-T', '--timezone', type=str, nargs='?', default='Europe/Berlin') +parser.add_argument('-T', '--timezone', type=str, nargs='?', default='') parser.add_argument('-r', '--retry', type=int, nargs='?', default=3) args = parser.parse_args() @@ -219,12 +219,12 @@ def main(): rate = 60 / (args.interval + 3) length = list.count(sents, None) command = None - timezone = ZoneInfo(args.timezone) + timezone = ZoneInfo(args.timezone) if args.timezone else None print(f'[信息] 当前发送速率 {round(rate, 2)} 封/分钟') if rate > 8.33: print('[警告] 当前发送速率已超出限制 8.33 封/分钟') print(f'[信息] 预计使用时间 {timedelta(minutes=length / rate)}') - print(f'[信息] 当前时区：{args.timezone}') + print(f'[信息] 当前时区：{args.timezone or '无'}') print(f'[信息] 已读取可用问候语 {len(greetings)} 条：', end='\n\n') for index, item in enumerate(greetings): @@ -286,12 +286,12 @@ def main(): locate("div.io-ox-mail-compose-window iframe", condition=EC.frame_to_be_available_and_switch_to_it) if command > 0 and (entry := greetings[command]): - match datetime.now(timezone).hour: + match datetime.now(timezone).hour if timezone else -1: case hour if 6 <= hour < 12: registry = entry.get('registry')[0] case hour if 12 <= hour < 18: registry = entry.get('registry')[1] case hour if 18 <= hour < 21: registry = entry.get('registry')[2] case _: registry = None - + iframe = driver.switch_to.active_element action = ActionChains(driver) clean = False