Explorar el Código

增加翻译与推荐

yEs1do hace 2 años
padre
commit
4c88903876
Se han modificado 2 ficheros con 11 adiciones y 10 borrados
  1. 10 9
      module/config/utils.py
  2. 1 1
      tasks/Component/config_scheduler.py

+ 10 - 9
module/config/utils.py

@@ -258,16 +258,17 @@ def parse_tomorrow_server(server_update: time, float_seconds: int = 0) -> dateti
     next_run = datetime.combine(tomorrow, server_update)
     next_run = datetime.combine(tomorrow, server_update)
     
     
     # 应用浮动时间
     # 应用浮动时间
-    next_run += timedelta(seconds=float_seconds)
-    
-    # 确保时间在第二天内,不回退到前一天,不跨越到第三天(考虑任务时间,最早 00:00,最晚 23:50)
-    start_of_tomorrow = datetime.combine(tomorrow, time.min)
-    end_of_tomorrow = datetime.combine(tomorrow, time(hour=23, minute=50))
+    if float_seconds !=0:
+        next_run += timedelta(seconds=float_seconds)
+
+        # 确保时间在第二天内,不回退到前一天,不跨越到第三天(考虑任务时间,最早 00:00,最晚 23:50)
+        start_of_tomorrow = datetime.combine(tomorrow, time.min)
+        end_of_tomorrow = datetime.combine(tomorrow, time(hour=23, minute=50))
     
     
-    if next_run < start_of_tomorrow:
-        next_run = start_of_tomorrow
-    elif next_run > end_of_tomorrow:
-        next_run = end_of_tomorrow
+        if next_run < start_of_tomorrow:
+            next_run = start_of_tomorrow
+        elif next_run > end_of_tomorrow:
+            next_run = end_of_tomorrow
     
     
     return next_run
     return next_run
 
 

+ 1 - 1
tasks/Component/config_scheduler.py

@@ -16,7 +16,7 @@ class Scheduler(ConfigBase):
     success_interval: TimeDelta = Field(default=TimeDelta(days=1), description='success_interval_help')
     success_interval: TimeDelta = Field(default=TimeDelta(days=1), description='success_interval_help')
     failure_interval: TimeDelta = Field(default=TimeDelta(days=1), description='failure_interval_help')
     failure_interval: TimeDelta = Field(default=TimeDelta(days=1), description='failure_interval_help')
     server_update: Time = Field(default=Time(hour=9, minute=0, second=0), description='server_update_help')
     server_update: Time = Field(default=Time(hour=9, minute=0, second=0), description='server_update_help')
-    float_time: Time = Field(default=Time(hour=0, minute=0, second=0), description='float_time_help')
+    float_time: Time = Field(default=Time(hour=0, minute=0, second=0), description='下次运行时间将在此范围内随机浮动。未设强制执行时,推荐浮动小于间隔:如寮突30±5分钟,寄养6±0.2小时;有强制执行时,确保不超出窗口:如麒麟19:01±1分钟,逢魔18:00±0.5小时,避免影响其他任务')
 
 
     @validator('next_run', pre=True, always=True)
     @validator('next_run', pre=True, always=True)
     def parse_next_run(cls, value):
     def parse_next_run(cls, value):