ENHANCEMENTS:

- MizEdit: date supports today, yesterday and tomorrow
- MizEdit: start_time supports now, morning, "noon +02:00", etc. now (thanks to Zip for contributing!)

Author: karel26

core/mizfile.py

@@ -5,20 +5,27 @@
 import logging
 import luadata
 import os
+import re
 import shutil
 import tempfile
 import zipfile
 
+from astral import LocationInfo
+from astral.sun import sun
 from core import utils
-from datetime import datetime
+from datetime import datetime, timedelta, date
 from packaging.version import parse, Version
+from timezonefinder import TimezoneFinder
 from typing import Union, Optional
+from zoneinfo import ZoneInfo
 
 __all__ = [
     "MizFile",
     "UnsupportedMizFileException"
 ]
 
+THEATRES = {}
+
 
 class MizFile:
 
@@ -34,6 +41,38 @@ def __init__(self, filename: str):
         self._load()
         self._files: list[dict] = []
         self.node = ServiceRegistry.get(ServiceBus).node
+        if not THEATRES:
+            self.read_theatres()
+
+    def read_theatres(self):
+        maps_path = os.path.join(os.path.expandvars(self.node.locals['DCS']['installation']), "Mods", "terrains")
+        if not os.path.exists(maps_path):
+            self.log.error(f"Maps directory not found: {maps_path}, can't use timezone specific parameters!")
+            return
+
+        for terrain in os.listdir(maps_path):
+            terrain_path = os.path.join(maps_path, terrain)
+            entry_lua = os.path.join(terrain_path, "entry.lua")
+            pattern = r'local self_ID\s*=\s*"(.*?)";'
+            with open(entry_lua, "r", encoding="utf-8") as file:
+                match = re.search(pattern, file.read())
+                terrain_id = match.group(1)
+            towns_file = os.path.join(terrain_path, "Map", "towns.lua")
+            if os.path.exists(towns_file):
+                try:
+                    pattern = r"latitude\s*=\s*([\d.-]+),\s*longitude\s*=\s*([\d.-]+)"
+                    with open(towns_file, "r", encoding="utf-8") as file:
+                        for line in file:
+                            match = re.search(pattern, line)
+                            if match:
+                                THEATRES[terrain_id] = {float(match.group(1)), float(match.group(2))}
+                                break
+                        else:
+                            self.log.warning(f"No towns found in: {towns_file}")
+                except Exception as ex:
+                    self.log.error(f"Error reading file {towns_file}: {ex}")
+            else:
+                self.log.info(f"No towns.lua found for terrain: {terrain}")
 
     def _load(self):
         try:
@@ -68,7 +107,8 @@ def save(self, new_filename: Optional[str] = None):
                             ...
                         else:
                             filenames.extend([
-                                utils.make_unix_filename(item['target'], x) for x in utils.list_all_files(item['source'])
+                                utils.make_unix_filename(item['target'], x) for x in
+                                utils.list_all_files(item['source'])
                             ])
                     for item in zin.infolist():
                         if item.filename == 'mission':
@@ -78,8 +118,9 @@ def save(self, new_filename: Optional[str] = None):
                             zout.writestr(item, "options = " + luadata.serialize(self.options, 'utf-8', indent='\t',
                                                                                  indent_level=0))
                         elif item.filename == 'warehouses':
-                            zout.writestr(item, "warehouses = " + luadata.serialize(self.warehouses, 'utf-8', indent='\t',
-                                                                                    indent_level=0))
+                            zout.writestr(item,
+                                          "warehouses = " + luadata.serialize(self.warehouses, 'utf-8', indent='\t',
+                                                                              indent_level=0))
                         elif item.filename not in filenames:
                             zout.writestr(item, zin.read(item.filename))
                     for item in self._files:
@@ -118,9 +159,28 @@ def apply_preset(self, preset: Union[dict, list]):
             # handle special cases
             if key == 'date':
                 if isinstance(value, str):
-                    self.date = datetime.strptime(value, '%Y-%m-%d')
+                    try:
+                        self.date = datetime.strptime(value, '%Y-%m-%d').date()
+                    except ValueError:
+                        if value in ['today', 'yesterday', 'tomorrow']:
+                            now = datetime.today().date()
+                            if value == 'today':
+                                self.date = now
+                            elif value == 'yesterday':
+                                self.date = now - timedelta(days=1)
+                            elif value == 'tomorrow':
+                                self.date = now + timedelta(days=1)
                 else:
                     self.date = value
+            elif key == 'start_time':
+                if isinstance(value, int):
+                    self.start_time = value
+                else:
+                    try:
+                        self.start_time = int((datetime.strptime(value, "%H:%M") -
+                                               datetime(1900, 1, 1)).total_seconds())
+                    except ValueError:
+                        self.start_time = self.parse_moment(value)
             elif key == 'clouds':
                 if isinstance(value, str):
                     self.clouds = {"preset": value}
@@ -146,20 +206,16 @@ def start_time(self) -> int:
         return self.mission['start_time']
 
     @start_time.setter
-    def start_time(self, value: Union[int, str]) -> None:
-        if isinstance(value, int):
-            start_time = value
-        else:
-            start_time = int((datetime.strptime(value, "%H:%M") - datetime(1900, 1, 1)).total_seconds())
-        self.mission['start_time'] = start_time
+    def start_time(self, value: int) -> None:
+        self.mission['start_time'] = value
 
     @property
-    def date(self) -> datetime:
-        date = self.mission['date']
-        return datetime(date['Year'], date['Month'], date['Day'])
+    def date(self) -> date:
+        value = self.mission['date']
+        return date(value['Year'], value['Month'], value['Day'])
 
     @date.setter
-    def date(self, value: datetime) -> None:
+    def date(self, value: date) -> None:
         self.mission['date'] = {"Day": value.day, "Year": value.year, "Month": value.month}
 
     @property
@@ -387,6 +443,75 @@ def files(self, files: list[Union[str, dict]]):
             else:
                 self._files.append(file)
 
+    def parse_moment(self, value: str = "morning") -> int:
+        """
+        Calculate the "moment" for the MizFile's theatre coordinates and date,
+        then return the time corresponding to the "moment" parameter in seconds since midnight
+        in the local timezone.
+
+        Example: parse_moment(mizfile, "sunrise") returns the time of sunrise in seconds since midnight
+        Example: parse_moment(mizfile, "sunrise + 01:00") returns the time of sunrise + 1 hour in seconds since midnight
+        Example: parse_moment(mizfile, "morning") returns the time of morning in seconds since midnight
+
+        Parameters:
+        self: MizFile object with date, theatreCoordinates, and start_time properties
+        value: string representing the moment to calculate
+
+        Constants available for the "moment" parameter:
+        - sunrise: The time of sunrise
+        - dawn: The time of dawn
+        - morning: Two hours after dawn
+        - noon: The time of solar noon
+        - evening: Two hours before sunset
+        - sunset: The time of sunset
+        - dusk: The time of dusk
+        - night: Two hours after dusk
+        """
+
+        # Get the date from the MizFile object
+        target_date = self.date
+
+        # Extract latitude and longitude from theatreCoordinates
+        latitude, longitude = THEATRES[self.theatre]
+
+        # Determine the local timezone
+        timezone = TimezoneFinder().timezone_at(lat=latitude, lng=longitude)
+        if not timezone:
+            raise ValueError("start_time: Could not determine timezone for the given coordinates!")
+
+        # Create a LocationInfo object for astral calculations
+        location = LocationInfo("Custom", "Location", timezone, latitude, longitude)
+
+        # Calculate sun times
+        solar_events = sun(location.observer, date=target_date, tzinfo=ZoneInfo(timezone)).copy()
+
+        # Alternate moments, calculated based on the solar events above
+        solar_events |= {
+            "now": datetime.now(tz=ZoneInfo(timezone)),
+            "morning": solar_events["dawn"] + timedelta(hours=2),
+            "evening": solar_events["sunset"] - timedelta(hours=2),
+            "night": solar_events["dusk"] + timedelta(hours=2)
+        }
+
+        match = re.match(r"(\w+)\s*([+-]\d{2}:\d{2})?", value.strip())
+        if not match:
+            raise ValueError("start_time: Invalid input format. Expected '<event> [+HH:MM|-HH:MM]'.")
+
+        event = match.group(1)  # the event
+        offset = match.group(2) # the offset time (+/- HH24:MM)
+
+        if not event or event.lower() not in solar_events:
+            raise ValueError(f"start_time: Invalid solar event '{event}'. "
+                             f"Valid events are {list(solar_events.keys())}.")
+
+        base_time = solar_events[event.lower()]
+        if offset:
+            hours, minutes = map(int, offset.split(":"))
+            delta = timedelta(hours=hours, minutes=minutes)
+            base_time += delta
+
+        return (base_time.hour * 3600) + (base_time.minute * 60)
+
     def modify(self, config: Union[list, dict]) -> None:
 
         def sort_dict(d):
@@ -430,7 +555,8 @@ def process_elements(reference: dict, **kwargs):
                                     element[_what - 1] = utils.evaluate(_with, reference=reference, **kkwargs, **kwargs)
                                 except IndexError:
                                     element.append(utils.evaluate(_with, reference=reference, **kkwargs, **kwargs))
-                            elif isinstance(element, dict) and any(isinstance(key, (int, float)) for key in element.keys()):
+                            elif isinstance(element, dict) and any(
+                                    isinstance(key, (int, float)) for key in element.keys()):
                                 element[_what] = utils.evaluate(_with, reference=reference, **kkwargs, **kwargs)
                                 sort = True
                         elif isinstance(_with, dict) and isinstance(element[_what], (int, str, float, bool)):

extensions/mizedit/README.md

@@ -86,6 +86,22 @@ With this method, you can change the following values in your mission (to be ext
 
 I highly recommend looking at a mission or options file inside your miz-file to see the structure of these settings.
 
+date has different options:
+* date: '2022-05-31' # normal date
+* date: 'today'      # one of today, yesterday, tomorrow
+
+start_time has different options:
+* start_time: 28800            # seconds since midnight (here: 08:00h)
+* start_time: '08:00'          # fixed time
+* start_time: 'noon'           # one of now, dawn, sunrise, morning, noon, evening, sunset, dusk, night as a moment in time based on the current map / date
+* start_time: 'morning +02:00' # relative time to one of the above-mentioned moments
+
+> [!NOTE]
+> The moments are calculated based on the current theatre and date. If you change the date through MizEdit, you need to
+> set that prior to the start_time!
+> 
+> Thanks @davidp57 for contributing the moments part!
+
 #### b) Attaching Files
 If you want to attach files to your mission (e.g. sounds but others like scripts, etc.), you can do it like this:
 ```yaml

plugins/scheduler/views.py

@@ -1,4 +1,6 @@
 import discord
+from discord import Interaction
+from discord._types import ClientT
 
 from core import Server
 from discord.ui import Modal, TextInput, View, Button
@@ -87,7 +89,8 @@ async def on_ok(self, interaction: discord.Interaction, _: Button):
     @discord.ui.button(label='Config', style=discord.ButtonStyle.secondary)
     async def on_config(self, interaction: discord.Interaction, _: Button):
         class ConfigModal(Modal, title="Server Configuration"):
-            name = TextInput(label="Name", default=self.server.name, max_length=80, required=True)
+            name = TextInput(label="Name", default=self.server.name if self.server.name != 'n/a' else '',
+                             min_length=3, max_length=80, required=True)
             description = TextInput(label="Description", style=discord.TextStyle.long,
                                     default=self.server.settings.get('description'), max_length=2000, required=False)
             password = TextInput(label="Password", placeholder="n/a", default=self.server.settings.get('password'),

requirements.txt

@@ -1,11 +1,14 @@
  # AIOFiles: File support for python's asyncio
 aiofiles==24.1.0
 
+# Astral: Get times for solar events (morning, noon, etc.)
+astral==3.2
+
 # For discord.py on Python 3.13
 audioop-lts==0.2.1; python_version>='3.13'
 
 # AIOHTTP: Uses asyncio for async/await native coroutines for establishing and handling HTTP connections
-aiohttp==3.11.12
+aiohttp==3.11.13
 
 # Certifi: Python package for providing Mozilla's CA Bundle
 certifi==2025.1.31
@@ -20,7 +23,7 @@ discord.py==2.4.0
 eyeD3==0.9.7
 
 # FastAPI: A modern, fast (high-performance), web framework for building APIs with Python 3.6+ based on standard Python type hints
-fastapi==0.115.8
+fastapi==0.115.11
 
 # FuzzyWuzzy: Python library that uses Levenshtein Distance to calculate the differences between strings
 fuzzywuzzy==0.18.0
@@ -56,22 +59,22 @@ packaging==24.2
 pid==3.0.4
 
 # Psycopg: PostgreSQL database adapter for Python
-psycopg[binary]==3.2.4
+psycopg[binary]==3.2.5
 
 # Psycopg Pool: PostgreSQL database adapter pool for Python
-psycopg-pool==3.2.4
+psycopg-pool==3.2.6
 
 # PSUtil: Cross-platform library to access system details and process utilities
 psutil==7.0.0
 
 # PyArrow: Python library providing high-performance tools for doing analytics on Arrow-based columnar data
-pyarrow==19.0.0
+pyarrow==19.0.1
 
 # pyKwalify: A Python library for YAML/JSON schema validation
 pykwalify==1.8.0
 
 # python-Levenshtein: Python extension for computing string edit distances and similarities
-python-Levenshtein==0.26.1
+python-Levenshtein==0.27.1
 
 # python-multipart: A library for parsing multipart/form-data input requests
 python-multipart==0.0.20
@@ -94,6 +97,9 @@ seaborn==0.13.2
 # SQL parser, to allow multiline SQLs
 sqlparse==0.5.3
 
+# TimetoneFinder: Find the right timezones for a given coordinate
+timezonefinder==6.5.8
+
 # tomli: Python TOML parser
 tomli==2.2.1
 tomli_w==1.2.0