Merge branch 'dev'

Author: DLmaster361

app/api/setting.py

@@ -21,9 +21,6 @@
 #   Contact: DLmaster_361@163.com
 
 
-import os
-from pathlib import Path
-import shutil
 from fastapi import APIRouter, Body
 from app.core import Config
 from app.services import System, Notify

app/core/config.py

@@ -78,7 +78,7 @@
 
 
 class AppConfig(GlobalConfig):
-    VERSION = "v5.0.3"
+    VERSION = "v5.0.4"
 
     def __init__(self) -> None:
         super().__init__()
@@ -117,7 +117,13 @@ def __init__(self) -> None:
         self.server: Optional[uvicorn.Server] = None
         self.websocket: Optional[WebSocket] = None
         self.power_sign: Literal[
-            "NoAction", "Shutdown", "ShutdownForce", "Hibernate", "Sleep", "KillSelf"
+            "NoAction",
+            "Shutdown",
+            "ShutdownForce",
+            "Reboot",
+            "Hibernate",
+            "Sleep",
+            "KillSelf",
         ] = "NoAction"
         self.temp_task: List[asyncio.Task] = []
 
@@ -144,7 +150,7 @@ async def check_data(self) -> None:
             db = sqlite3.connect(self.database_path)
             cur = db.cursor()
             cur.execute("CREATE TABLE version(v text)")
-            cur.execute("INSERT INTO version VALUES(?)", ("v1.10",))
+            cur.execute("INSERT INTO version VALUES(?)", ("v1.11",))
             db.commit()
             cur.close()
             db.close()
@@ -155,7 +161,7 @@ async def check_data(self) -> None:
         cur.execute("SELECT * FROM version WHERE True")
         version = cur.fetchall()
 
-        if version[0][0] != "v1.10":
+        if version[0][0] != "v1.11":
             logger.info(
                 "数据文件版本更新开始",
             )
@@ -422,6 +428,30 @@ async def check_data(self) -> None:
                 cur.execute("DELETE FROM version WHERE v = ?", ("v1.9",))
                 cur.execute("INSERT INTO version VALUES(?)", ("v1.10",))
                 db.commit()
+            # v1.10-->v1.11
+            if version[0][0] == "v1.10" or if_streaming:
+                logger.info(
+                    "数据文件版本更新: v1.10-->v1.11",
+                )
+                if_streaming = True
+
+                if (Path.cwd() / "config/ScriptConfig.json").exists():
+                    data = (Path.cwd() / "config/ScriptConfig.json").read_text(
+                        encoding="utf-8"
+                    )
+                    data.replace("IfWakeUp", "IfStartUp")
+                    data.replace("IfAutoRoguelike", "IfRoguelike")
+                    data.replace("IfBase", "IfInfrast")
+                    data.replace("IfCombat", "IfFight")
+                    data.replace("IfMission", "IfAward")
+                    data.replace("IfRecruiting", "IfRecruit")
+                    (Path.cwd() / "config/ScriptConfig.json").write_text(
+                        data, encoding="utf-8"
+                    )
+
+                cur.execute("DELETE FROM version WHERE v = ?", ("v1.10",))
+                cur.execute("INSERT INTO version VALUES(?)", ("v1.11",))
+                db.commit()
 
             cur.close()
             db.close()
@@ -1407,6 +1437,7 @@ def proxy(self) -> Optional[httpx.Proxy]:
     async def get_stage_info(
         self,
         type: Literal[
+            "User",
             "Today",
             "ALL",
             "Monday",
@@ -1441,15 +1472,17 @@ async def get_stage_info(
                 "Activity": json.loads(self.get("Data", "Stage")).get("Info", []),
                 "Resource": res_stage_info,
             }
-        elif type == "Today":
-            data = json.loads(self.get("Data", "Stage")).get(
-                datetime.now(tz=UTC4).strftime("%A"), []
-            )
+        elif type == "User":
+            data = json.loads(self.get("Data", "Stage")).get("ALL", [])
             for combox in data:
                 combox["label"] = RESOURCE_STAGE_DATE_TEXT.get(
                     combox["value"], combox["label"]
                 )
             return data
+        elif type == "Today":
+            return json.loads(self.get("Data", "Stage")).get(
+                datetime.now(tz=UTC4).strftime("%A"), []
+            )
         else:
             return json.loads(self.get("Data", "Stage")).get(type, [])
 
@@ -1807,26 +1840,16 @@ async def save_maa_log(self, log_path: Path, logs: list, maa_result: str) -> boo
         # 查找所有Fight任务的开始和结束位置
         fight_tasks = []
         for i, line in enumerate(logs):
-            if (
-                "开始任务: Fight" in line
-                or "开始任务: 刷理智" in line
-                or "开始任务: 理智作战" in line
-            ):
+            if "开始任务: Fight" in line or "开始任务: 理智作战" in line:
                 # 查找对应的任务结束位置
                 end_index = -1
                 for j in range(i + 1, len(logs)):
-                    if (
-                        "完成任务: Fight" in logs[j]
-                        or "完成任务: 刷理智" in logs[j]
-                        or "完成任务: 理智作战" in logs[j]
-                    ):
+                    if "完成任务: Fight" in logs[j] or "完成任务: 理智作战" in logs[j]:
                         end_index = j
                         break
                     # 如果遇到新的Fight任务开始, 则当前任务没有正常结束
                     if j < len(logs) and (
-                        "开始任务: Fight" in logs[j]
-                        or "开始任务: 刷理智" in logs[j]
-                        or "开始任务: 理智作战" in logs[j]
+                        "开始任务: Fight" in logs[j] or "开始任务: 理智作战" in logs[j]
                     ):
                         break
 

app/core/emulator_manager.py

@@ -78,13 +78,13 @@ async def get_emulator_instance(self, emulator_id: str) -> DeviceBase:
             raise ValueError(f"不支持的模拟器类型: {config.get('Data', 'Type')}")
 
     async def operate_emulator(
-        self, operate: Literal["open", "close"], emulator_id: str, index: str
+        self, operate: Literal["open", "close", "show"], emulator_id: str, index: str
     ):
 
         asyncio.create_task(self.operate_emulator_task(operate, emulator_id, index))
 
     async def operate_emulator_task(
-        self, operate: Literal["open", "close"], emulator_id: str, index: str
+        self, operate: Literal["open", "close", "show"], emulator_id: str, index: str
     ):
 
         try:
@@ -96,6 +96,8 @@ async def operate_emulator_task(
                 await temp_emulator.open(index)
             elif operate == "close":
                 await temp_emulator.close(index)
+            elif operate == "show":
+                await temp_emulator.setVisible(index, True)
         except Exception as e:
             await Config.send_websocket_message(
                 id="EmulatorManager",

app/core/timer.py

@@ -75,6 +75,7 @@ async def timed_start(self):
         """定时启动代理任务"""
 
         curtime = datetime.now().strftime("%Y-%m-%d %H:%M")
+        curday = datetime.now().strftime("%A")
 
         for uid, queue in Config.QueueConfig.items():
 
@@ -86,8 +87,10 @@ async def timed_start(self):
                 continue
 
             for time_set in queue.TimeSet.values():
-                if time_set.get("Info", "Enabled") and curtime[11:16] == time_set.get(
-                    "Info", "Time"
+                if (
+                    time_set.get("Info", "Enabled")
+                    and curday in time_set.get("Info", "Days")
+                    and curtime[11:16] == time_set.get("Info", "Time")
                 ):
                     logger.info(f"定时唤起任务：{uid}")
                     task_id = await TaskManager.add_task("AutoProxy", str(uid))

app/models/ConfigBase.py

@@ -88,6 +88,25 @@ def correct(self, value: Any) -> Any:
         return value if self.validate(value) else self.options[0]
 
 
+class MultipleOptionsValidator(ConfigValidator):
+    """多选选项验证器"""
+
+    def __init__(self, options: list):
+        if not options:
+            raise ValueError("可选项不能为空")
+
+        self.options = options
+
+    def validate(self, value: Any) -> bool:
+        if not isinstance(value, list):
+            return False
+
+        return all(item in self.options for item in value)
+
+    def correct(self, value: Any) -> Any:
+        return value if self.validate(value) else []
+
+
 class UUIDValidator(ConfigValidator):
     """UUID验证器"""
 

app/models/config.py

@@ -19,7 +19,6 @@
 #   Contact: DLmaster_361@163.com
 
 
-import re
 import uuid
 import json
 import calendar
@@ -34,6 +33,7 @@
     MultipleUIDValidator,
     BoolValidator,
     OptionsValidator,
+    MultipleOptionsValidator,
     RangeValidator,
     VirtualConfigValidator,
     FileValidator,
@@ -137,8 +137,15 @@ def __init__(self) -> None:
 
         ## Info ------------------------------------------------------------
         ## 是否启用
-        self.Info_Enabled = ConfigItem("Info", "Enabled", False, BoolValidator())
-        ## 时间点
+        self.Info_Enabled = ConfigItem("Info", "Enabled", True, BoolValidator())
+        ## 执行周期
+        self.Info_Days = ConfigItem(
+            "Info",
+            "Days",
+            list(calendar.day_name),
+            MultipleOptionsValidator(list(calendar.day_name)),
+        )
+        ## 执行时间
         self.Info_Time = ConfigItem("Info", "Time", "00:00", DateTimeValidator("%H:%M"))
 
 
@@ -167,11 +174,12 @@ def __init__(self) -> None:
             OptionsValidator(
                 [
                     "NoAction",
-                    "KillSelf",
-                    "Sleep",
-                    "Hibernate",
                     "Shutdown",
                     "ShutdownForce",
+                    "Reboot",
+                    "Hibernate",
+                    "Sleep",
+                    "KillSelf",
                 ]
             ),
         )
@@ -295,10 +303,6 @@ def __init__(self) -> None:
         self.Data_LastProxyDate = ConfigItem(
             "Data", "LastProxyDate", "2000-01-01", DateTimeValidator("%Y-%m-%d")
         )
-        ## 上次剿灭日期
-        self.Data_LastAnnihilationDate = ConfigItem(
-            "Data", "LastAnnihilationDate", "2000-01-01", DateTimeValidator("%Y-%m-%d")
-        )
         ## 上次森空岛签到日期
         self.Data_LastSklandDate = ConfigItem(
             "Data", "LastSklandDate", "2000-01-01", DateTimeValidator("%Y-%m-%d")
@@ -315,23 +319,21 @@ def __init__(self) -> None:
         )
 
         ## Task ------------------------------------------------------------
-        ## 是否 自动唤醒
-        self.Task_IfWakeUp = ConfigItem("Task", "IfWakeUp", True, BoolValidator())
-        ## 是否公招
-        self.Task_IfRecruiting = ConfigItem(
-            "Task", "IfRecruiting", True, BoolValidator()
-        )
-        ## 是否基建
-        self.Task_IfBase = ConfigItem("Task", "IfBase", True, BoolValidator())
-        ## 是否刷图
-        self.Task_IfCombat = ConfigItem("Task", "IfCombat", True, BoolValidator())
-        ## 是否商店
+        ## 是否自动唤醒
+        self.Task_IfStartUp = ConfigItem("Task", "IfStartUp", True, BoolValidator())
+        ## 是否理智作战
+        self.Task_IfFight = ConfigItem("Task", "IfFight", True, BoolValidator())
+        ## 是否基建换班
+        self.Task_IfInfrast = ConfigItem("Task", "IfInfrast", True, BoolValidator())
+        ## 是否公开招募
+        self.Task_IfRecruit = ConfigItem("Task", "IfRecruit", True, BoolValidator())
+        ## 是否信用收支
         self.Task_IfMall = ConfigItem("Task", "IfMall", True, BoolValidator())
-        ## 是否任务
-        self.Task_IfMission = ConfigItem("Task", "IfMission", True, BoolValidator())
+        ## 是否领取奖励
+        self.Task_IfAward = ConfigItem("Task", "IfAward", True, BoolValidator())
         ## 是否自动肉鸽
-        self.Task_IfAutoRoguelike = ConfigItem(
-            "Task", "IfAutoRoguelike", False, BoolValidator()
+        self.Task_IfRoguelike = ConfigItem(
+            "Task", "IfRoguelike", False, BoolValidator()
         )
         ## 是否生息演算
         self.Task_IfReclamation = ConfigItem(
@@ -455,9 +457,9 @@ def __init__(self) -> None:
         self.Run_RoutineTimeLimit = ConfigItem(
             "Run", "RoutineTimeLimit", 10, RangeValidator(1, 9999)
         )
-        ## 是否限制剿灭每周一次
-        self.Run_AnnihilationWeeklyLimit = ConfigItem(
-            "Run", "AnnihilationWeeklyLimit", True, BoolValidator()
+        ## 剿灭避免无代理卡浪费理智
+        self.Run_AnnihilationAvoidWaste = ConfigItem(
+            "Run", "AnnihilationAvoidWaste", False, BoolValidator()
         )
 
         self.UserData = MultipleConfig([MaaUserConfig])
@@ -479,16 +481,7 @@ def __init__(self) -> None:
 
         self.config_item_dict: dict[str, dict[str, ConfigItem]] = {}
 
-        for group in [
-            "ALL",
-            "Monday",
-            "Tuesday",
-            "Wednesday",
-            "Thursday",
-            "Friday",
-            "Saturday",
-            "Sunday",
-        ]:
+        for group in ["ALL", *calendar.day_name]:
             self.config_item_dict[group] = {}
 
             ## 理智药数量