CHANGES:

- DCS updates can now have an update_window to configure times when no DCS update should take place.

Author: karel26

README.md

@@ -357,14 +357,19 @@ NODENAME:                       # this will usually be your hostname
   DCS:
     installation: '%ProgramFiles%\\Eagle Dynamics\\DCS World Server'  # This is your DCS installation. Usually autodetected by the bot.
     autoupdate: true            # enable auto-update for your DCS servers. Default is false.
-    announce:                   # Optional: post a message to Discord after every update
+    announce:                   # Optional: post a message to Discord after an update was conducted
       channel: 11223344556677
       title: DCS has been updated to version {}!
       description: 'The following servers have been updated:'
       footer: Please make sure you update your DCS client to join!
       mention:                  # Optional mentioning
         - Admin
         - DCS Admin
+    update_window:              # Optional update window. No update will happen if N is set for the respective time and day.
+      timezone: Europe/Berlin   # Optional timezone, default is the local time of the server.
+      00-18: YYYYYYY
+      18-20: YYYYYYN            # Do not update DCS on Sundays, 18:00-20:00 LT
+      20-24: YYYYYYY
     use_upnp: true              # Do you want to use UPnP to forward your DCS ports automatically? If not set, the global setting will be used.
     cloud: true                 # If you have installed DCS on a NAS or cloud drive, autoupdate and desanitization will only take place once on all your nodes.
     desanitize: true            # Desanitize your MissionScripting.lua after each update. Default is true.

core/data/impl/nodeimpl.py

@@ -23,6 +23,7 @@
 from core.const import SAVED_GAMES
 from core.data.maintenance import ServerMaintenanceManager
 from core.translations import get_translation
+from datetime import datetime
 from discord.ext import tasks
 from gzip import BadGzipFile
 from migrate import migrate
@@ -35,6 +36,7 @@
 from typing import Optional, Union, Awaitable, Callable, Any, cast
 from urllib.parse import urlparse, quote
 from version import __version__
+from zoneinfo import ZoneInfo
 
 from core.autoexec import Autoexec
 from core.data.dataobject import DataObjectFactory, DataObject
@@ -1129,11 +1131,31 @@ async def dcs_update(self, *, branch: Optional[str] = None, version: Optional[st
                 }
             })
 
+    def can_update(self):
+        update_window = self.locals.get('DCS', {}).get('update_window')
+        if update_window:
+            now: datetime = datetime.now()
+            tz = now.astimezone().tzinfo
+            now = now.replace(tzinfo=tz)
+            weekday = now.weekday()
+            for period, daystate in update_window.items():  # type: str, str
+                if period == 'timezone':
+                    tz = ZoneInfo(daystate)
+                    continue
+                if len(daystate) != 7:
+                    self.log.error(f"Error in nodes.yaml (update_window): {daystate} has to be 7 characters long!")
+                    return False
+                state = daystate[weekday]
+                if utils.is_in_timeframe(now, period, tz):
+                    return state.upper() == 'Y'
+        return True
+
     @tasks.loop(minutes=5.0)
     async def autoupdate(self):
         # don't run if an update is currently running
-        if self.update_pending:
+        if self.update_pending or not self.can_update():
             return
+        # Check if we are in the correct time window
         try:
             version = await self.is_dcs_update_available()
             if version:
@@ -1159,7 +1181,7 @@ async def before_autoupdate(self):
 
         # check for updates
         new_version = await self.is_dcs_update_available()
-        if new_version:
+        if new_version and self.can_update():
             await self.dcs_update(version=new_version)
         self.update_pending = False
 

plugins/scheduler/commands.py

@@ -108,8 +108,9 @@ async def check_server_state(server: Server, config: dict) -> Status:
                     continue
                 if len(daystate) != 7:
                     server.log.error(f"Error in scheduler.yaml: {daystate} has to be 7 characters long!")
+                    break
                 state = daystate[weekday]
-                # check, if the server should be running
+                # check if the server should be running
                 if (utils.is_in_timeframe(now, period, tz) and state.upper() == 'Y' and
                         server.status == Status.SHUTDOWN):
                     return Status.RUNNING

schemas/nodes_schema.yaml

@@ -41,6 +41,12 @@ mapping:
                 nullable: false
                 sequence:
                   - { type: text, nullable: false }
+          update_window:
+            type: map
+            nullable: false
+            mapping:
+              timezone: { type: str, nullable: false, range: { min: 1 } }
+              regex;(^(0?[0-9]|1[0-9]|2[0-4])(:[0-5][0-9])?-(0?[0-9]|1[0-9]|2[0-4])(:?[0-5][0-9])?$): { type: str, pattern: '^[YNP]{7}$', nullable: false }
           desanitize: {type: bool, nullable: false}
           minimized: {type: bool, nullable: false}
           user: {type: str, nullable: false, range: {min: 1}}