소스 검색

Merge pull request #386 from yEs1do/feat(FloatTime)

修复未设置浮动时间的固定时间范围
huangrunheng 2 년 전
부모
커밋
e4040c5ad0
1개의 변경된 파일과 10개의 추가작업 그리고 9개의 파일을 삭제
  1. 10 9
      module/config/utils.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