refactor(config): 新增 ConfigUtils 工具类并优化配置管理逻辑

- 新增 ConfigUtils 工具类，提供配置路径获取等工具方法 - 将 ConfigManager.getValidateAutomationConfigPaths() 重构为 ConfigUtils.getAutomationConfigPaths() - 优化 MsgBase 中 LogManager 的导入方式，使用模块导入替代函数导入 - 规范化 TimerUtils.py 中 calculate_next_repeat_time() 的文档字符串格式
2026-06-18 15:33:03 +08:00 · 2026-03-23 13:31:06 +08:00
parent 1c88d3db7b
commit baa4f23136
9 changed files with 100 additions and 92 deletions
@@ -10,41 +10,47 @@ See the LICENSE file for details.
 from datetime import datetime, timedelta


-def calculateNextRepeatTime(
-    repeat_days: list,
-    hour: int,
-    minute: int,
-    second: int
-) -> datetime:
+class TimerUtils:
    """
-        Calculate the next repeat time based on repeat days and target time.
-
-        This function calculates the next execution time for a repeatable task.
-        If the current day is in repeat_days and the target time has not passed,
-        it returns today's target time. Otherwise, it finds the next matching day.
-
-        Args:
-            repeat_days (list): List of weekdays to repeat (0=Monday, 6=Sunday).
-            hour (int): Target hour (0-23).
-            minute (int): Target minute (0-59).
-            second (int): Target second (0-59).
-
-        Returns:
-            datetime: The next repeat execution time.
+        Timer utilities class.
    """

-    current_time = datetime.now()
-    current_weekday = current_time.weekday()
-    target_time = current_time.replace(hour=hour, minute=minute, second=second, microsecond=0)
-    if current_weekday in repeat_days:
-        if target_time > current_time:
-            return target_time
-    repeat_days_sorted = sorted(repeat_days)
-    for day in repeat_days_sorted:
-        if day > current_weekday:
-            days_until = day - current_weekday
-            next_time = target_time + timedelta(days=days_until)
-            return next_time
-    days_until = 7 - current_weekday + repeat_days_sorted[0]
-    next_time = target_time + timedelta(days=days_until)
-    return next_time
+    @staticmethod
+    def getNextTimerRepeatTime(
+        repeat_days: list[int],
+        hour: int,
+        minute: int,
+        second: int
+    ) -> datetime:
+        """
+            Calculate the next repeat time based on repeat days and target time.
+
+            This function calculates the next execution time for a repeatable task.
+            If the current day is in repeat_days and the target time has not passed,
+            it returns today's target time. Otherwise, it finds the next matching day.
+
+            Args:
+                repeat_days (list[int]): List of weekdays to repeat (0=Monday, 6=Sunday).
+                hour (int): Target hour (0-23).
+                minute (int): Target minute (0-59).
+                second (int): Target second (0-59).
+
+            Returns:
+                datetime: The next repeat execution time.
+        """
+
+        current_time = datetime.now()
+        current_weekday = current_time.weekday()
+        target_time = current_time.replace(hour=hour, minute=minute, second=second, microsecond=0)
+        if current_weekday in repeat_days:
+            if target_time > current_time:
+                return target_time
+        repeat_days_sorted = sorted(repeat_days)
+        for day in repeat_days_sorted:
+            if day > current_weekday:
+                days_until = day - current_weekday
+                next_time = target_time + timedelta(days=days_until)
+                return next_time
+        days_until = 7 - current_weekday + repeat_days_sorted[0]
+        next_time = target_time + timedelta(days=days_until)
+        return next_time