diff --git a/app/core/config.py b/app/core/config.py index 0427f39..dd18d58 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -793,8 +793,11 @@ class GlobalConfig(QConfig): ui_location = ConfigItem("UI", "location", "100x100") ui_maximized = ConfigItem("UI", "maximized", False, BoolValidator()) - notify_IfSendErrorOnly = ConfigItem( - "Notify", "IfSendErrorOnly", False, BoolValidator() + notify_SendTaskResultTime = OptionsConfigItem( + "Notify", + "SendTaskResultTime", + "不推送", + OptionsValidator(["不推送", "任何时刻", "仅失败时"]), ) notify_IfSendStatistic = ConfigItem( "Notify", "IfSendStatistic", False, BoolValidator() diff --git a/app/models/MAA.py b/app/models/MAA.py index 31159d1..2f2f62a 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -34,6 +34,7 @@ import subprocess import shutil import time from pathlib import Path +from jinja2 import Environment, FileSystemLoader from typing import Union, List from app.core import Config @@ -312,7 +313,7 @@ class MaaManager(QObject): self.push_notification( "公招六星", f"喜报：用户 {user[0]} 公招出六星啦！", - "好羡慕~", + {"user_name": self.data[user[2]][0]}, ) # 成功完成代理的用户修改相关参数 @@ -334,6 +335,7 @@ class MaaManager(QObject): ): statistics = Config.merge_maa_logs("指定项", user_logs_list) + statistics["user_info"] = user[0] statistics["start_time"] = user_start_time.strftime( "%Y-%m-%d %H:%M:%S" ) @@ -481,7 +483,7 @@ class MaaManager(QObject): self.user_config_path.mkdir(parents=True, exist_ok=True) shutil.copy(self.maa_set_path, self.user_config_path) - end_log = "" + result_text = "" # 导出结果 if self.mode in ["自动代理", "人工排查"]: @@ -504,28 +506,25 @@ class MaaManager(QObject): wait_index = [_[2] for _ in self.user_list if _[1] == "等待"] # 保存运行日志 - end_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") - end_log = ( - f"任务开始时间：{begin_time}，结束时间：{end_time}\n" - f"已完成数：{len(over_index)}，未完成数：{len(error_index) + len(wait_index)}\n\n" - ) - - if len(error_index) != 0: - end_log += ( - f"{self.mode[2:4]}未成功的用户：\n" - f"{"\n".join([self.data[_][0] for _ in error_index])}\n" - ) - if len(wait_index) != 0: - end_log += ( - f"\n未开始{self.mode[2:4]}的用户：\n" - f"{"\n".join([self.data[_][0] for _ in wait_index])}\n" - ) - title = ( f"{self.set["MaaSet"]["Name"]}的{self.mode[:4]}任务报告" if self.set["MaaSet"]["Name"] != "" else f"{self.mode[:4]}任务报告" ) + result = { + "title": f"{self.mode[:4]}任务报告", + "script_name": ( + self.set["MaaSet"]["Name"] + if self.set["MaaSet"]["Name"] != "" + else "空白" + ), + "start_time": begin_time, + "end_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "completed_count": len(over_index), + "uncompleted_count": len(error_index) + len(wait_index), + "failed_user": [self.data[_][0] for _ in error_index], + "waiting_user": [self.data[_][0] for _ in wait_index], + } # 推送代理结果通知 Notify.push_plyer( title.replace("报告", "已完成！"), @@ -533,18 +532,23 @@ class MaaManager(QObject): f"已完成用户数：{len(over_index)}，未完成用户数：{len(error_index) + len(wait_index)}", 10, ) - if not Config.global_config.get( - Config.global_config.notify_IfSendErrorOnly - ) or ( - Config.global_config.get(Config.global_config.notify_IfSendErrorOnly) + if Config.global_config.get( + Config.global_config.notify_SendTaskResultTime + ) == "任何时刻" or ( + Config.global_config.get(Config.global_config.notify_SendTaskResultTime) + == "仅失败时" and len(error_index) + len(wait_index) != 0 ): - self.push_notification("代理结果", title, end_log) + result_text = self.push_notification("代理结果", title, result) + else: + result_text = self.push_notification( + "代理结果", title, result, if_get_text_only=True + ) self.agree_bilibili(False) self.log_monitor.deleteLater() self.log_monitor_timer.deleteLater() - self.accomplish.emit({"Time": begin_time, "History": end_log}) + self.accomplish.emit({"Time": begin_time, "History": result_text}) def requestInterruption(self) -> None: logger.info(f"{self.name} | 收到任务中止申请") @@ -1167,142 +1171,50 @@ class MaaManager(QObject): return dt.strftime("%Y-%m-%d") def push_notification( - self, mode: str, title: str, message: Union[str, dict] - ) -> None: + self, + mode: str, + title: str, + message: Union[str, dict], + if_get_text_only: bool = False, + ) -> str: """通过所有渠道推送通知""" + env = Environment( + loader=FileSystemLoader(str(Config.app_path / "resources/html")) + ) + if mode == "代理结果": - Notify.send_mail( - "文本", - title, - f"{message}\n\nAUTO_MAA 敬上\n\n我们根据您在 AUTO_MAA 中的设置发送了这封电子邮件，本邮件无需回复\n", + # 生成文本通知内容 + message_text = ( + f"任务开始时间：{message["start_time"]}，结束时间：{message["end_time"]}\n" + f"已完成数：{message["completed_count"]}，未完成数：{message["uncompleted_count"]}\n\n" ) - Notify.ServerChanPush(title, f"{message}\n\nAUTO_MAA 敬上") - Notify.CompanyWebHookBotPush(title, f"{message}AUTO_MAA 敬上") + + if len(message["failed_user"]) > 0: + message_text += f"{self.mode[2:4]}未成功的用户：\n{"\n".join(message["failed_user"])}\n" + if len(message["waiting_user"]) > 0: + message_text += f"\n未开始{self.mode[2:4]}的用户：\n{"\n".join(message["waiting_user"])}\n" + + if if_get_text_only: + return message_text + + # 生成HTML通知内容 + message["failed_user"] = "、".join(message["failed_user"]) + message["waiting_user"] = "、".join(message["waiting_user"]) + + template = env.get_template("MAA_result.html") + message_html = template.render(message) + + Notify.send_mail("网页", title, message_html) + Notify.ServerChanPush(title, f"{message_text}\n\nAUTO_MAA 敬上") + Notify.CompanyWebHookBotPush(title, f"{message_text}\n\nAUTO_MAA 敬上") + + return message_text elif mode == "统计信息": - # HTML模板 - html_template = """ - - - - - {title} - - - -
-

{title}

- -

开始时间: {start_time}

-

结束时间: {end_time}

-

MAA执行结果: {maa_result}

- -

招募统计

- - - - - - - - - {recruit_rows} - -
星级数量
- - {drop_tables} -
- - - """ - - # 构建招募统计表格行 - recruit_rows = "".join( - f"{star}{count}" - for star, count in message["recruit_statistics"].items() - ) - - # 构建掉落统计数据表格 - drop_tables_html = "" - for stage, items in message["drop_statistics"].items(): - drop_rows = "".join( - f"{item}{quantity}" - for item, quantity in items.items() - ) - drop_table = f""" -

掉落统计 ({stage})

- - - - - - - - - {drop_rows} - -
物品数量
- """ - drop_tables_html += drop_table - - # 填充HTML模板 - html_content = html_template.format( - title=title, - start_time=message["start_time"], - end_time=message["end_time"], - maa_result=message["maa_result"], - recruit_rows=recruit_rows, - drop_tables=drop_tables_html, - ) - + # 生成文本通知内容 formatted = [] for stage, items in message["drop_statistics"].items(): formatted.append(f"掉落统计（{stage}）:") @@ -1315,7 +1227,6 @@ class MaaManager(QObject): formatted.append(f" {star}: {count}") recruit_text = "\n".join(formatted) - # 构建通知消息 message_text = ( f"开始时间: {message['start_time']}\n" f"结束时间: {message['end_time']}\n" @@ -1324,16 +1235,20 @@ class MaaManager(QObject): f"{drop_text}" ) - Notify.send_mail("网页", title, html_content) + # 生成HTML通知内容 + template = env.get_template("MAA_statistics.html") + message_html = template.render(message) + + Notify.send_mail("网页", title, message_html) Notify.ServerChanPush(title, f"{message_text}\n\nAUTO_MAA 敬上") Notify.CompanyWebHookBotPush(title, f"{message_text}\n\nAUTO_MAA 敬上") elif mode == "公招六星": - Notify.send_mail( - "文本", - title, - f"{message}\n\nAUTO_MAA 敬上\n\n我们根据您在 AUTO_MAA 中的设置发送了这封电子邮件，本邮件无需回复\n", - ) - Notify.ServerChanPush(title, f"{message}\n\nAUTO_MAA 敬上") - Notify.CompanyWebHookBotPush(title, f"{message}AUTO_MAA 敬上") + # 生成HTML通知内容 + template = env.get_template("MAA_six_star.html") + message_html = template.render(message) + + Notify.send_mail("网页", title, message_html) + Notify.ServerChanPush(title, "好羡慕~\n\nAUTO_MAA 敬上") + Notify.CompanyWebHookBotPush(title, "好羡慕~\n\nAUTO_MAA 敬上") diff --git a/app/ui/setting.py b/app/ui/setting.py index ee68a06..5aa6e92 100644 --- a/app/ui/setting.py +++ b/app/ui/setting.py @@ -543,20 +543,15 @@ class NotifySettingCard(HeaderCardWidget): self.setTitle("通知") self.card_NotifyContent = self.NotifyContentSettingCard(self) - self.card_IfPushPlyer = SwitchSettingCard( - icon=FluentIcon.PAGE_RIGHT, - title="推送系统通知", - content="推送系统级通知，不会在通知中心停留", - configItem=Config.global_config.notify_IfPushPlyer, - ) - self.card_SendMail = self.SendMailSettingCard(self) + self.card_Plyer = self.PlyerSettingCard(self) + self.card_EMail = self.EMailSettingCard(self) self.card_ServerChan = self.ServerChanSettingCard(self) self.card_CompanyWebhookBot = self.CompanyWechatPushSettingCard(self) Layout = QVBoxLayout() Layout.addWidget(self.card_NotifyContent) - Layout.addWidget(self.card_IfPushPlyer) - Layout.addWidget(self.card_SendMail) + Layout.addWidget(self.card_Plyer) + Layout.addWidget(self.card_EMail) Layout.addWidget(self.card_ServerChan) Layout.addWidget(self.card_CompanyWebhookBot) self.viewLayout.addLayout(Layout) @@ -568,11 +563,12 @@ class NotifySettingCard(HeaderCardWidget): FluentIcon.SETTING, "通知内容选项", "选择需要推送的通知内容", parent ) - self.card_IfSendErrorOnly = SwitchSettingCard( + self.card_SendTaskResultTime = ComboBoxSettingCard( + configItem=Config.global_config.notify_SendTaskResultTime, icon=FluentIcon.PAGE_RIGHT, - title="仅推送异常信息", - content="仅在任务出现异常时推送通知", - configItem=Config.global_config.notify_IfSendErrorOnly, + title="推送任务结果选项", + content="选择推送自动代理与人工排查任务结果的时机", + texts=["不推送", "任何时刻", "仅失败时"], ) self.card_IfSendStatistic = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, @@ -589,18 +585,39 @@ class NotifySettingCard(HeaderCardWidget): widget = QWidget() Layout = QVBoxLayout(widget) - Layout.addWidget(self.card_IfSendErrorOnly) + Layout.addWidget(self.card_SendTaskResultTime) Layout.addWidget(self.card_IfSendStatistic) Layout.addWidget(self.card_IfSendSixStar) self.viewLayout.setContentsMargins(0, 0, 0, 0) self.viewLayout.setSpacing(0) self.addGroupWidget(widget) - class SendMailSettingCard(ExpandGroupSettingCard): + class PlyerSettingCard(ExpandGroupSettingCard): def __init__(self, parent=None): super().__init__( - FluentIcon.SETTING, "推送邮件通知", "通过电子邮箱推送任务结果", parent + FluentIcon.SETTING, "推送系统通知", "Plyer系统通知推送渠道", parent + ) + + self.card_IfPushPlyer = SwitchSettingCard( + icon=FluentIcon.PAGE_RIGHT, + title="推送系统通知", + content="使用Plyer推送系统级通知，不会在通知中心停留", + configItem=Config.global_config.notify_IfPushPlyer, + ) + + widget = QWidget() + Layout = QVBoxLayout(widget) + Layout.addWidget(self.card_IfPushPlyer) + self.viewLayout.setContentsMargins(0, 0, 0, 0) + self.viewLayout.setSpacing(0) + self.addGroupWidget(widget) + + class EMailSettingCard(ExpandGroupSettingCard): + + def __init__(self, parent=None): + super().__init__( + FluentIcon.SETTING, "推送邮件通知", "电子邮箱通知推送渠道", parent ) self.card_IfSendMail = SwitchSettingCard( @@ -654,7 +671,7 @@ class NotifySettingCard(HeaderCardWidget): super().__init__( FluentIcon.SETTING, "推送ServerChan通知", - "通过ServerChan通知推送任务结果", + "ServerChan通知推送渠道", parent, ) @@ -701,7 +718,7 @@ class NotifySettingCard(HeaderCardWidget): super().__init__( FluentIcon.SETTING, "推送企业微信机器人通知", - "通过企业微信机器人Webhook通知推送任务结果", + "企业微信机器人Webhook通知推送渠道", parent, ) diff --git a/requirements.txt b/requirements.txt index 95ceb9a..a8597de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,6 @@ pywin32 pyautogui pycryptodome requests +Jinja2 serverchan_sdk nuitka==2.6 \ No newline at end of file diff --git a/resources/html/MAA_result.html b/resources/html/MAA_result.html new file mode 100644 index 0000000..78328d2 --- /dev/null +++ b/resources/html/MAA_result.html @@ -0,0 +1,160 @@ + + + + + + + + +
+
+

{{ title }}

+ + +
+ +
+

脚本实例名称：{{ script_name }}

+

任务开始时间：{{ start_time }}

+

任务结束时间：{{ end_time }}

+

已完成数：{{ completed_count }}

+ {% if uncompleted_count %} +

未完成数：{{ uncompleted_count }}

+ {% endif %} + {% if failed_user %} +

代理未成功的用户： {{ failed_user }}

+ {% endif %} + {% if waiting_user %} +

未开始代理的用户： {{ waiting_user }}

+ {% endif %} +
+ +

AUTO_MAA 敬上

+ + +
+
+

软件仓库：

+ AUTO_MAA GitHub +
+
+

文档站仓库：

+ AUTO_MAA 文档站 GitHub +
+
+
+ + + \ No newline at end of file diff --git a/resources/html/MAA_six_star.html b/resources/html/MAA_six_star.html new file mode 100644 index 0000000..38b461a --- /dev/null +++ b/resources/html/MAA_six_star.html @@ -0,0 +1,129 @@ + + + + + + + + +
+
+

喜报！

+ + +
+ +
+

恭喜用户 {{ user_name }} 喜提公开招募六星高资！

+
+ +

AUTO_MAA 敬上

+ + +
+
+

软件仓库：

+ AUTO_MAA GitHub +
+
+

文档站仓库：

+ AUTO_MAA 文档站 GitHub +
+
+
+ + + \ No newline at end of file diff --git a/resources/html/MAA_statistics.html b/resources/html/MAA_statistics.html new file mode 100644 index 0000000..b3c3e56 --- /dev/null +++ b/resources/html/MAA_statistics.html @@ -0,0 +1,233 @@ + + + + + + + + +
+
+

自动代理统计报告

+ + +
+ +
+

用户代理信息：{{ user_info }}

+

任务开始时间：{{ start_time }}

+

任务结束时间：{{ end_time }}

+

MAA执行结果： + {% if maa_result == '代理任务全部完成' %} + {{ maa_result }} + {% elif maa_result == '代理任务未全部完成' %} + {{ maa_result }} + {% else %} + {{ maa_result }} + {% endif %} +

+ + {% if recruit_statistics %} +

公招统计

+ + + + + + {% for star, count in recruit_statistics %} + + + + + {% endfor %} +
星级数量
{{ star }}{{ count }}
+ {% endif %} + + {% if drop_statistics %} + {% for stage, items in drop_statistics.items() %} +

掉落统计（{{ stage }}）

+ + + + + + {% for item, amount in items.items() %} + + + + + {% endfor %} +
物品数量
{{ item }}{{ amount }}
+ {% endfor %} + {% endif %} +
+ +

AUTO_MAA 敬上

+ + +
+
+

软件仓库：

+ AUTO_MAA GitHub +
+
+

文档站仓库：

+ AUTO_MAA 文档站 GitHub +
+
+
+ + + \ No newline at end of file diff --git a/resources/version.json b/resources/version.json index 951fec4..cd9a3b2 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,5 +1,5 @@ { - "main_version": "4.2.4.7", + "main_version": "4.2.4.8", "updater_version": "1.1.2.1", "announcement": "\n## 新增功能\n- 历史记录统计功能上线\n- 添加软件主页\n- 添加启动时直接最小化功能\n- 更新器拥有多网址测速功能\n- 添加统计信息通知功能（含六星监测）\n## 修复BUG\n- RMA70-12不能正确统计的问题\n- 更新器修正`channel`\n## 程序优化\n- 添加MAA监测字段：`未检测到任何模拟器`\n- 取消MAA运行中自动更新", "proxy_list": [