diff --git a/.gitignore b/.gitignore index 0908b98..5366a11 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,6 @@ data/ debug/ history/ script/ -resources/notice.json -resources/theme_image.json -resources/images/Home/BannerTheme.jpg \ No newline at end of file +res/notice.json +res/theme_image.json +res/images/Home/BannerTheme.jpg \ No newline at end of file diff --git a/app/services/notification.py b/app/services/notification.py index 828483f..fe0473d 100644 --- a/app/services/notification.py +++ b/app/services/notification.py @@ -61,7 +61,7 @@ class Notification: title=title, message=message, app_name="AUTO_MAA", - app_icon=(Path.cwd() / "resources/icons/AUTO_MAA.ico").as_posix(), + app_icon=(Path.cwd() / "res/icons/AUTO_MAA.ico").as_posix(), timeout=t, ticker=ticker, toast=True, @@ -272,7 +272,7 @@ class Notification: Config.get("Notify", "CompanyWebHookBotUrl"), ) Notify.CompanyWebHookBotPushImage( - Path.cwd() / "resources/images/notification/test_notify.png", + Path.cwd() / "res/images/notification/test_notify.png", Config.get("Notify", "CompanyWebHookBotUrl"), ) diff --git a/app/task/MAA.py b/app/task/MAA.py index 64c08a6..9e36530 100644 --- a/app/task/MAA.py +++ b/app/task/MAA.py @@ -1840,7 +1840,7 @@ class MaaManager: """通过所有渠道推送通知""" logger.info(f"开始推送通知，模式：{mode}，标题：{title}") - env = Environment(loader=FileSystemLoader(str(Path.cwd() / "resources/html"))) + env = Environment(loader=FileSystemLoader(str(Path.cwd() / "res/html"))) if mode == "代理结果" and ( Config.get("Notify", "SendTaskResultTime") == "任何时刻" @@ -2017,7 +2017,7 @@ class MaaManager: Config.get("Notify", "CompanyWebHookBotUrl"), ) Notify.CompanyWebHookBotPushImage( - Path.cwd() / "resources/images/notification/six_star.png", + Path.cwd() / "res/images/notification/six_star.png", Config.get("Notify", "CompanyWebHookBotUrl"), ) @@ -2061,7 +2061,7 @@ class MaaManager: self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"), ) Notify.CompanyWebHookBotPushImage( - Path.cwd() / "resources/images/notification/six_star.png", + Path.cwd() / "res/images/notification/six_star.png", self.cur_user_data.get("Notify", "CompanyWebHookBotUrl"), ) else: diff --git a/app/task/general.py b/app/task/general.py index 997dcb7..8c91a87 100644 --- a/app/task/general.py +++ b/app/task/general.py @@ -937,7 +937,7 @@ class GeneralManager: logger.info(f"开始推送通知，模式：{mode}，标题：{title}") - env = Environment(loader=FileSystemLoader(str(Path.cwd() / "resources/html"))) + env = Environment(loader=FileSystemLoader(str(Path.cwd() / "res/html"))) if mode == "代理结果" and ( Config.get("Notify", "SendTaskResultTime") == "任何时刻" diff --git a/resources/docs/ChineseSimplified.isl b/res/docs/ChineseSimplified.isl similarity index 100% rename from resources/docs/ChineseSimplified.isl rename to res/docs/ChineseSimplified.isl diff --git a/resources/docs/MAA_config_info.txt b/res/docs/MAA_config_info.txt similarity index 100% rename from resources/docs/MAA_config_info.txt rename to res/docs/MAA_config_info.txt diff --git a/resources/html/MAA_result.html b/res/html/MAA_result.html similarity index 100% rename from resources/html/MAA_result.html rename to res/html/MAA_result.html diff --git a/resources/html/MAA_six_star.html b/res/html/MAA_six_star.html similarity index 100% rename from resources/html/MAA_six_star.html rename to res/html/MAA_six_star.html diff --git a/resources/html/MAA_statistics.html b/res/html/MAA_statistics.html similarity index 100% rename from resources/html/MAA_statistics.html rename to res/html/MAA_statistics.html diff --git a/resources/html/general_result.html b/res/html/general_result.html similarity index 100% rename from resources/html/general_result.html rename to res/html/general_result.html diff --git a/resources/html/general_statistics.html b/res/html/general_statistics.html similarity index 100% rename from resources/html/general_statistics.html rename to res/html/general_statistics.html diff --git a/resources/icons/AUTO_MAA.ico b/res/icons/AUTO_MAA.ico similarity index 100% rename from resources/icons/AUTO_MAA.ico rename to res/icons/AUTO_MAA.ico diff --git a/resources/icons/AUTO_MAA_Updater.ico b/res/icons/AUTO_MAA_Updater.ico similarity index 100% rename from resources/icons/AUTO_MAA_Updater.ico rename to res/icons/AUTO_MAA_Updater.ico diff --git a/resources/icons/MirrorChyan.ico b/res/icons/MirrorChyan.ico similarity index 100% rename from resources/icons/MirrorChyan.ico rename to res/icons/MirrorChyan.ico diff --git a/resources/images/AUTO_MAA.png b/res/images/AUTO_MAA.png similarity index 100% rename from resources/images/AUTO_MAA.png rename to res/images/AUTO_MAA.png diff --git a/resources/images/Home/BannerDefault.png b/res/images/Home/BannerDefault.png similarity index 100% rename from resources/images/Home/BannerDefault.png rename to res/images/Home/BannerDefault.png diff --git a/resources/images/README/payid.png b/res/images/README/payid.png similarity index 100% rename from resources/images/README/payid.png rename to res/images/README/payid.png diff --git a/resources/images/notification/six_star.png b/res/images/notification/six_star.png similarity index 100% rename from resources/images/notification/six_star.png rename to res/images/notification/six_star.png diff --git a/resources/images/notification/test_notify.png b/res/images/notification/test_notify.png similarity index 100% rename from resources/images/notification/test_notify.png rename to res/images/notification/test_notify.png diff --git a/resources/sounds/both/删除用户.wav b/res/sounds/both/删除用户.wav similarity index 100% rename from resources/sounds/both/删除用户.wav rename to res/sounds/both/删除用户.wav diff --git a/resources/sounds/both/删除脚本实例.wav b/res/sounds/both/删除脚本实例.wav similarity index 100% rename from resources/sounds/both/删除脚本实例.wav rename to res/sounds/both/删除脚本实例.wav diff --git a/resources/sounds/both/删除计划表.wav b/res/sounds/both/删除计划表.wav similarity index 100% rename from resources/sounds/both/删除计划表.wav rename to res/sounds/both/删除计划表.wav diff --git a/resources/sounds/both/删除调度队列.wav b/res/sounds/both/删除调度队列.wav similarity index 100% rename from resources/sounds/both/删除调度队列.wav rename to res/sounds/both/删除调度队列.wav diff --git a/resources/sounds/both/欢迎回来.wav b/res/sounds/both/欢迎回来.wav similarity index 100% rename from resources/sounds/both/欢迎回来.wav rename to res/sounds/both/欢迎回来.wav diff --git a/resources/sounds/both/添加用户.wav b/res/sounds/both/添加用户.wav similarity index 100% rename from resources/sounds/both/添加用户.wav rename to res/sounds/both/添加用户.wav diff --git a/resources/sounds/both/添加脚本实例.wav b/res/sounds/both/添加脚本实例.wav similarity index 100% rename from resources/sounds/both/添加脚本实例.wav rename to res/sounds/both/添加脚本实例.wav diff --git a/resources/sounds/both/添加计划表.wav b/res/sounds/both/添加计划表.wav similarity index 100% rename from resources/sounds/both/添加计划表.wav rename to res/sounds/both/添加计划表.wav diff --git a/resources/sounds/both/添加调度队列.wav b/res/sounds/both/添加调度队列.wav similarity index 100% rename from resources/sounds/both/添加调度队列.wav rename to res/sounds/both/添加调度队列.wav diff --git a/resources/sounds/noisy/ADB失败.wav b/res/sounds/noisy/ADB失败.wav similarity index 100% rename from resources/sounds/noisy/ADB失败.wav rename to res/sounds/noisy/ADB失败.wav diff --git a/resources/sounds/noisy/ADB成功.wav b/res/sounds/noisy/ADB成功.wav similarity index 100% rename from resources/sounds/noisy/ADB成功.wav rename to res/sounds/noisy/ADB成功.wav diff --git a/resources/sounds/noisy/MAA在完成任务前中止.wav b/res/sounds/noisy/MAA在完成任务前中止.wav similarity index 100% rename from resources/sounds/noisy/MAA在完成任务前中止.wav rename to res/sounds/noisy/MAA在完成任务前中止.wav diff --git a/resources/sounds/noisy/MAA在完成任务前退出.wav b/res/sounds/noisy/MAA在完成任务前退出.wav similarity index 100% rename from resources/sounds/noisy/MAA在完成任务前退出.wav rename to res/sounds/noisy/MAA在完成任务前退出.wav diff --git a/resources/sounds/noisy/MAA更新.wav b/res/sounds/noisy/MAA更新.wav similarity index 100% rename from resources/sounds/noisy/MAA更新.wav rename to res/sounds/noisy/MAA更新.wav diff --git a/resources/sounds/noisy/MAA未检测到任何模拟器.wav b/res/sounds/noisy/MAA未检测到任何模拟器.wav similarity index 100% rename from resources/sounds/noisy/MAA未检测到任何模拟器.wav rename to res/sounds/noisy/MAA未检测到任何模拟器.wav diff --git a/resources/sounds/noisy/MAA未能正确登录PRTS.wav b/res/sounds/noisy/MAA未能正确登录PRTS.wav similarity index 100% rename from resources/sounds/noisy/MAA未能正确登录PRTS.wav rename to res/sounds/noisy/MAA未能正确登录PRTS.wav diff --git a/resources/sounds/noisy/MAA的ADB连接异常.wav b/res/sounds/noisy/MAA的ADB连接异常.wav similarity index 100% rename from resources/sounds/noisy/MAA的ADB连接异常.wav rename to res/sounds/noisy/MAA的ADB连接异常.wav diff --git a/resources/sounds/noisy/MAA进程超时.wav b/res/sounds/noisy/MAA进程超时.wav similarity index 100% rename from resources/sounds/noisy/MAA进程超时.wav rename to res/sounds/noisy/MAA进程超时.wav diff --git a/resources/sounds/noisy/MAA部分任务执行失败.wav b/res/sounds/noisy/MAA部分任务执行失败.wav similarity index 100% rename from resources/sounds/noisy/MAA部分任务执行失败.wav rename to res/sounds/noisy/MAA部分任务执行失败.wav diff --git a/resources/sounds/noisy/任务开始.wav b/res/sounds/noisy/任务开始.wav similarity index 100% rename from resources/sounds/noisy/任务开始.wav rename to res/sounds/noisy/任务开始.wav diff --git a/resources/sounds/noisy/任务结束.wav b/res/sounds/noisy/任务结束.wav similarity index 100% rename from resources/sounds/noisy/任务结束.wav rename to res/sounds/noisy/任务结束.wav diff --git a/resources/sounds/noisy/公告展示.wav b/res/sounds/noisy/公告展示.wav similarity index 100% rename from resources/sounds/noisy/公告展示.wav rename to res/sounds/noisy/公告展示.wav diff --git a/resources/sounds/noisy/公告通知.wav b/res/sounds/noisy/公告通知.wav similarity index 100% rename from resources/sounds/noisy/公告通知.wav rename to res/sounds/noisy/公告通知.wav diff --git a/resources/sounds/noisy/六星喜报.wav b/res/sounds/noisy/六星喜报.wav similarity index 100% rename from resources/sounds/noisy/六星喜报.wav rename to res/sounds/noisy/六星喜报.wav diff --git a/resources/sounds/noisy/历史记录查询.wav b/res/sounds/noisy/历史记录查询.wav similarity index 100% rename from resources/sounds/noisy/历史记录查询.wav rename to res/sounds/noisy/历史记录查询.wav diff --git a/resources/sounds/noisy/发生异常.wav b/res/sounds/noisy/发生异常.wav similarity index 100% rename from resources/sounds/noisy/发生异常.wav rename to res/sounds/noisy/发生异常.wav diff --git a/resources/sounds/noisy/发生错误.wav b/res/sounds/noisy/发生错误.wav similarity index 100% rename from resources/sounds/noisy/发生错误.wav rename to res/sounds/noisy/发生错误.wav diff --git a/resources/sounds/noisy/子任务失败.wav b/res/sounds/noisy/子任务失败.wav similarity index 100% rename from resources/sounds/noisy/子任务失败.wav rename to res/sounds/noisy/子任务失败.wav diff --git a/resources/sounds/noisy/排查录入.wav b/res/sounds/noisy/排查录入.wav similarity index 100% rename from resources/sounds/noisy/排查录入.wav rename to res/sounds/noisy/排查录入.wav diff --git a/resources/sounds/noisy/排查重试.wav b/res/sounds/noisy/排查重试.wav similarity index 100% rename from resources/sounds/noisy/排查重试.wav rename to res/sounds/noisy/排查重试.wav diff --git a/resources/sounds/noisy/无新版本.wav b/res/sounds/noisy/无新版本.wav similarity index 100% rename from resources/sounds/noisy/无新版本.wav rename to res/sounds/noisy/无新版本.wav diff --git a/resources/sounds/noisy/有新版本.wav b/res/sounds/noisy/有新版本.wav similarity index 100% rename from resources/sounds/noisy/有新版本.wav rename to res/sounds/noisy/有新版本.wav diff --git a/resources/sounds/noisy/森空岛签到失败.wav b/res/sounds/noisy/森空岛签到失败.wav similarity index 100% rename from resources/sounds/noisy/森空岛签到失败.wav rename to res/sounds/noisy/森空岛签到失败.wav diff --git a/resources/sounds/noisy/森空岛签到成功.wav b/res/sounds/noisy/森空岛签到成功.wav similarity index 100% rename from resources/sounds/noisy/森空岛签到成功.wav rename to res/sounds/noisy/森空岛签到成功.wav diff --git a/resources/sounds/simple/任务开始.wav b/res/sounds/simple/任务开始.wav similarity index 100% rename from resources/sounds/simple/任务开始.wav rename to res/sounds/simple/任务开始.wav diff --git a/resources/sounds/simple/任务结束.wav b/res/sounds/simple/任务结束.wav similarity index 100% rename from resources/sounds/simple/任务结束.wav rename to res/sounds/simple/任务结束.wav diff --git a/resources/sounds/simple/公告展示.wav b/res/sounds/simple/公告展示.wav similarity index 100% rename from resources/sounds/simple/公告展示.wav rename to res/sounds/simple/公告展示.wav diff --git a/resources/sounds/simple/公告通知.wav b/res/sounds/simple/公告通知.wav similarity index 100% rename from resources/sounds/simple/公告通知.wav rename to res/sounds/simple/公告通知.wav diff --git a/resources/sounds/simple/历史记录查询.wav b/res/sounds/simple/历史记录查询.wav similarity index 100% rename from resources/sounds/simple/历史记录查询.wav rename to res/sounds/simple/历史记录查询.wav diff --git a/resources/sounds/simple/发生异常.wav b/res/sounds/simple/发生异常.wav similarity index 100% rename from resources/sounds/simple/发生异常.wav rename to res/sounds/simple/发生异常.wav diff --git a/resources/sounds/simple/发生错误.wav b/res/sounds/simple/发生错误.wav similarity index 100% rename from resources/sounds/simple/发生错误.wav rename to res/sounds/simple/发生错误.wav diff --git a/resources/sounds/simple/无新版本.wav b/res/sounds/simple/无新版本.wav similarity index 100% rename from resources/sounds/simple/无新版本.wav rename to res/sounds/simple/无新版本.wav diff --git a/resources/sounds/simple/有新版本.wav b/res/sounds/simple/有新版本.wav similarity index 100% rename from resources/sounds/simple/有新版本.wav rename to res/sounds/simple/有新版本.wav diff --git a/resources/version.json b/res/version.json similarity index 100% rename from resources/version.json rename to res/version.json