ENHANCEMENTS:

- Scheduler can now handle presets on startup and action

CHANGES:
- Scheduler: local_times and utc_times migrated to times (auto-migration)
- MizEdit: can work with timezones now

Author: karel26

plugins/mission/status.py

@@ -207,11 +207,8 @@ async def render(self, server: Server):
         self.add_field(name="This server runs on the following schedule:", value='_ _', inline=False)
         value = ''
         now = datetime.now()
-        tz = now.astimezone().tzinfo
+        tz = ZoneInfo(config['timezone']) if 'timezone' in config else now.astimezone().tzinfo
         for period, daystate in config['schedule'].items():
-            if period == 'timezone':
-                tz = ZoneInfo(daystate)
-                continue
             for c in daystate:
                 if c == 'Y':
                     value += '✅|'

plugins/scheduler/commands.py

@@ -140,8 +140,8 @@ async def check_server_state(server: Server, config: dict) -> Status:
         # ------------------------------------------------------------------
         now = datetime.now()
         tz = (
-            ZoneInfo(config['schedule'].get('timezone'))
-            if 'timezone' in config['schedule']
+            ZoneInfo(config.get('timezone'))
+            if 'timezone' in config
             else None
         )
 
@@ -155,9 +155,6 @@ async def check_server_state(server: Server, config: dict) -> Status:
         # 3.  Walk through the schedule periods
         # ------------------------------------------------------------------
         for period, daystate in config['schedule'].items():
-            if period == 'timezone':  # skip the optional tz key
-                continue
-
             # Validate that the daystate string is 7 characters long
             if len(daystate) != 7:
                 server.log.error(
@@ -602,14 +599,7 @@ def _handle_times(server: Server, config: dict, rconf: dict, warn_time: int) ->
         """
         if 'times' in rconf:
             option = 'times'
-            tz = next(
-                (
-                    v
-                    for k, v in config.get("schedule", {}).items()
-                    if k == "timezone"
-                ),
-                None,
-            )
+            tz = config.get('timezone')
         elif 'local_times' in rconf:
             option = 'local_times'
             tz = None
@@ -685,15 +675,11 @@ def _handle_cron(server: Server, config: dict, rconf: dict, warn_time: int) -> i
         """
         *cron* – evaluate the cron expression at the *restart_time* that would occur after *warn_time* seconds.
         """
-        tz = next(
-            (
-                v
-                for k, v in config.get("schedule", {}).items()
-                if k == "timezone"
-            ),
-            None,
+        tzinfo = (
+            ZoneInfo(config.get('timezone'))
+            if 'timezone' in config
+            else None
         )
-        tzinfo = ZoneInfo(tz) if tz else None
         restart_time = datetime.now(tz=tzinfo) + timedelta(seconds=warn_time)
         restart_time = restart_time.replace(second=0, microsecond=0)
 

plugins/scheduler/listener.py

@@ -1,11 +1,9 @@
 import asyncio
-import os
-import random
 from zoneinfo import ZoneInfo
 
 from croniter import croniter
 
-from core import EventListener, utils, Server, Player, Status, event, chat_command
+from core import EventListener, utils, Server, Player, event, chat_command
 from datetime import datetime, timedelta, timezone
 from typing import TYPE_CHECKING
 
@@ -93,7 +91,7 @@ async def get_next_restart(self, server: Server, restart: dict | list) -> tuple[
                     return None
             elif 'cron' in restart:
                 now = datetime.now().replace(second=0, microsecond=0)
-                tz = next((v for x, v in self.get_config(server).get('schedule', {}).items() if x == 'timezone'), None)
+                tz = self.get_config(server).get('timezone')
                 if tz:
                     tzinfo = ZoneInfo(tz)
                     now = now.replace(tzinfo=tzinfo)