Просмотр исходного кода

feat(config): service time can be mandatory

runhey 3 лет назад
Родитель
Сommit
742b8cbe13

+ 43 - 12
config/template.json

@@ -28,7 +28,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "global_game": {
@@ -47,7 +47,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     },
     "general_battle": {
       "lock_team_enable": false,
@@ -76,7 +76,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "gold_youkai": {
@@ -86,7 +86,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "nian": {
@@ -96,7 +96,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "realm_raid": {
@@ -106,7 +106,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     },
     "raid_config": {
       "raid_mode": "retreat_four_attack_nine",
@@ -136,7 +136,38 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
+    },
+    "orochi_config": {
+      "user_status": "leader",
+      "layer": "悲鸣",
+      "limit_time": "00:30:00",
+      "limit_count": 30,
+      "soul_buff_enable": false
+    },
+    "invite_config": {
+      "invite_number": "one",
+      "friend_1": "",
+      "friend_2": "",
+      "find_mode": "auto_find",
+      "wait_time": "00:01:00",
+      "default_invite": true
+    },
+    "general_battle_config": {
+      "lock_team_enable": false,
+      "preset_enable": false,
+      "preset_group": 1,
+      "preset_team": 1,
+      "buff_enable": false,
+      "buff_awake_click": false,
+      "buff_soul_click": false,
+      "buff_gold_50_click": false,
+      "buff_gold_100_click": false,
+      "buff_exp_50_click": false,
+      "buff_exp_100_click": false,
+      "green_enable": false,
+      "green_mark": "green_left1",
+      "random_click_swipt_enable": false
     }
   },
   "orochi_moans": {
@@ -146,7 +177,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "sougenbi": {
@@ -156,7 +187,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "fallen_sun": {
@@ -166,7 +197,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "eternity_sea": {
@@ -176,7 +207,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     }
   },
   "activity_shikigami": {
@@ -186,7 +217,7 @@
       "priority": 5,
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "06:00:00"
+      "server_update": "09:00:00"
     },
     "general_climb": {
       "limit_time": "00 01:00:00",

BIN
module/config/i18n/zh_CN.qm


+ 3 - 2
module/config/i18n/zh_CN.ts

@@ -313,7 +313,7 @@
 	<message><source>Priority</source><translation>任务优先级</translation></message>
 	<message><source>Success Interval</source><translation>执行任务成功后设定下次执行的间隔时间</translation></message>
 	<message><source>Failure Interval</source><translation>执行任务失败后设定下次执行的间隔时间</translation></message>
-	<message><source>Server Update</source><translation>服务器更新时间</translation></message>
+	<message><source>Server Update</source><translation>强制设定服务时间</translation></message>
 	<message><source>enable_help</source><translation>将这个任务加入调度器</translation></message>
 	<message><source>next_run_help</source><translation>会根据下面的间隔时间自动计算时间,清空后回车即可设置为当前</translation></message>
 	<message><source>priority_help</source><translation>如果设置调度规则为基于优先级,则该选项有效
@@ -323,7 +323,8 @@
 	<message><source>interval_minutes_help</source><translation>可取[0~60]</translation></message>
 	<message><source>success_interval_help</source><translation>一般默认,时间格式:"[days] [hours]:[minutes]:[seconds]"</translation></message>
 	<message><source>failure_interval_help</source><translation>一般默认即可,时间格式同上,不按照格式输入会无法正确设置</translation></message>
-	<message><source>server_update_help</source><translation>服务器更新时间,占位符,还没想好怎么用</translation></message>
+	<message><source>server_update_help</source><translation>如果设定不是默认的 "09:00:00",该任务每次执行完毕后会强制设定下次运行时间为第二天的设定值
+格式 hh:mm:ss </translation></message>
 </context>
 <context>
     <name>Args</name>

+ 16 - 1
module/config/utils.py

@@ -6,7 +6,7 @@ import json
 import yaml
 
 from filelock import FileLock
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, timezone, time
 
 from module.config.atomicwrites import atomic_write
 
@@ -242,3 +242,18 @@ def dict_to_kv(dictionary, allow_none=True):
     """
     return ', '.join([f'{k}={repr(v)}' for k, v in dictionary.items() if allow_none or v is not None])
 
+
+def parse_tomorrow_server(server_update: time) -> datetime:
+    """
+    获取明天的日期,给这个日期加上server_update的时间,返回datetime
+    :param server_update:
+    :return:
+    """
+    if isinstance(server_update, str):
+        server_update = time.fromisoformat(server_update)
+    now = datetime.now()
+    tomorrow = now + timedelta(days=1)
+    return datetime.combine(tomorrow, server_update)
+
+if __name__ == '__main__':
+    print(parse_tomorrow_server("09:01:00"))

+ 1 - 1
tasks/Component/config_scheduler.py

@@ -15,7 +15,7 @@ class Scheduler(ConfigBase):
 
     success_interval: TimeDelta = Field(default=TimeDelta(days=1), description='success_interval_help')
     failure_interval: TimeDelta = Field(default=TimeDelta(days=1), description='failure_interval_help')
-    server_update: time = Field(default=time(hour=6, minute=0, second=0), description='server_update_help')
+    server_update: time = Field(default=time(hour=9, minute=0, second=0), description='server_update_help')
 
     @validator('next_run', pre=True, always=True)
     def parse_next_run(cls, value):

+ 33 - 20
tasks/base_task.py

@@ -18,7 +18,7 @@ from module.ocr.base_ocr import OcrMode, OcrMethod
 from module.logger import logger
 from module.base.timer import Timer
 from module.config.config import Config
-from module.config.utils import get_server_next_update, nearest_future, dict_to_kv
+from module.config.utils import get_server_next_update, nearest_future, dict_to_kv, parse_tomorrow_server
 from module.device.device import Device
 from tasks.GlobalGame.assets import GlobalGameAssets
 from tasks.GlobalGame.config_emergency import FriendInvitation, WhenNetworkAbnormal, WhenNetworkError
@@ -410,7 +410,7 @@ class BaseTask(GlobalGameAssets):
                 sleep(1)  # 等待滑动完成, 还没想好如何优化
 
     def set_next_run(self, task: str, finish: bool = False,
-                     success: bool=None, server: bool=None, target: timedelta=None) -> None:
+                     success: bool=None, server: bool=True, target: timedelta=None) -> None:
         """
         设置下次运行时间  当然这个也是可以重写的
         :param target: 可以自定义的下次运行时间
@@ -449,29 +449,42 @@ class BaseTask(GlobalGameAssets):
                 else scheduler.failure_interval
             )
             run.append(start_time + interval)
-        if server is not None:
-            if server:
-                server = scheduler.server_update
-                run.append(get_server_next_update(server))
+        # if server is not None:
+        #     if server:
+        #         server = scheduler.server_update
+        #         run.append(get_server_next_update(server))
         if target is not None:
             target = [target] if not isinstance(target, list) else target
             target = nearest_future(target)
             run.append(target)
+
+
+        next_run = None
         # 排序
-        if len(run):
-            run = min(run).replace(microsecond=0)
-            kv = dict_to_kv(
-                {
-                    "success": success,
-                    "server_update": server,
-                    "target": target,
-                },
-                allow_none=False,
-            )
-            logger.info(f"Delay task `{task}` to {run} ({kv})")
-            scheduler.next_run = run
-            self.config.save()
-        else:
+        if not len(run):
             raise ScriptError(
                 "Missing argument in delay_next_run, should set at least one"
             )
+
+        run = min(run).replace(microsecond=0)
+        next_run = run
+        # 将这些连接起来,方便日志输出
+        kv = dict_to_kv(
+            {
+                "success": success,
+                "server_update": server,
+                "target": target,
+            },
+            allow_none=False,
+        )
+        logger.info(f"Delay task `{task}` to {next_run} ({kv})")
+
+        # 强制设定下一次的运行时间
+        if server and scheduler.server_update != time(hour=9):
+            next_run = parse_tomorrow_server(scheduler.server_update)
+
+        # 设置
+        scheduler.next_run = next_run
+        self.config.save()
+
+