CHANGES:

- autoupdate structure changes in DCS, SRS and LotAtc to allow a separate "announce" structure (auto migrated).

Author: karel26

README.md

@@ -356,14 +356,14 @@ 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.
-#    autoupdate:                 # alternative configuration with a message being posted to Discord after every update
-#      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
+    announce:                   # Optional: post a message to Discord after every update
+      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
     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

@@ -433,8 +433,11 @@ async def update_db(self):
                                 await conn.execute(query.rstrip())
                         cursor = await conn.execute('SELECT version FROM version')
                         self.db_version = (await cursor.fetchone())[0]
-                        await asyncio.to_thread(migrate, self.node, old_version, self.db_version)
-                        self.log.info(f'- Database upgraded from {old_version} to {self.db_version}.')
+                        rc = await asyncio.to_thread(migrate, self.node, old_version, self.db_version)
+                        if rc != -2:
+                            self.log.info(f'- Database upgraded from {old_version} to {self.db_version}.')
+                        if rc in [-1, -2]:
+                            sys.exit(rc)
 
     def install_plugins(self):
         for file in Path('plugins').glob('*.zip'):
@@ -1067,8 +1070,8 @@ async def dcs_update(self, *, branch: Optional[str] = None, version: Optional[st
                     "message": f"DCS World updated to version {version} on node {self.node.name}."
                 }
             })
-            if announce and isinstance(self.locals['DCS'].get('autoupdate'), dict):
-                config = self.locals['DCS'].get('autoupdate')
+            config = self.config.get('announce')
+            if config and announce:
                 embed = discord.Embed(
                     colour=discord.Colour.blue(),
                     title=config.get(

extensions/lotatc/README.md

@@ -13,12 +13,12 @@ MyNode:
     LotAtc:
       installation: '%ProgramFiles%\LotAtc' # the installation path to your LotAtc installation
       autoupdate: true                      # auto update LotAtc, if a new version is available online (default: false)
-#      autoupdate:           # alternative configuration with a message being posted to Discord after every update
-#        title: LotAtc has been updated to version {}!
-#        description: 'The following servers will be updated on the next restart:'
-#        footer: Please make sure you update your LotAtc client also!
-#        mention:            # Optional mentioning
-#          - DCS
+      announce:             # Optional: post a message to Discord after every update
+        title: LotAtc has been updated to version {}!
+        description: 'The following servers will be updated on the next restart:'
+        footer: Please make sure you update your LotAtc client also!
+        mention:            # Optional mentioning
+          - DCS
   instances:
     DCS.release_server:
       # [...]

extensions/lotatc/extension.py

@@ -309,8 +309,8 @@ async def schedule(self):
                         "message": f"{self.name} updated to version {version} on node {self.node.name}."
                     }
                 })
-                if isinstance(self.config.get('autoupdate'), dict):
-                    config = self.config.get('autoupdate')
+                config = self.config.get('announce')
+                if config:
                     servers = []
                     for instance in self.node.instances:
                         if (instance.locals.get('extensions', {}).get(self.name) and

extensions/srs/README.md

@@ -17,12 +17,12 @@ MyNode:
       installation: '%ProgramFiles%\DCS-SimpleRadio-Standalone'
       beta: true  # allow beta versions
       autoupdate: true      # auto update your DCS-SRS installation, if a new version is available online (default: false)
-#      autoupdate:           # alternative configuration with a message being posted to Discord after every update
-#        title: DCS-SRS has been updated to version {}!
-#        description: 'The following servers have been updated:'
-#        footer: Please make sure you update your DCS-SRS client also!
-#        mention:            # Optional mentioning
-#          - DCS
+      announce:             # Optional: post a message to Discord after every update
+        title: DCS-SRS has been updated to version {}!
+        description: 'The following servers have been updated:'
+        footer: Please make sure you update your DCS-SRS client also!
+        mention:            # Optional mentioning
+          - DCS
   # [...]
   instances:
     DCS.release_server:

extensions/srs/extension.py

@@ -534,8 +534,8 @@ async def handle_update(self):
                             "message": f"{self.name} updated to version {version} on node {self.node.name}."
                         }
                     })
-                    if isinstance(self.config.get('autoupdate'), dict):
-                        config = self.config.get('autoupdate')
+                    config = self.config.get('announce')
+                    if config:
                         servers = []
                         for instance in self.node.instances:
                             if instance.locals.get('extensions', {}).get(self.name) and instance.locals['extensions'][self.name].get('enabled', True):

migrate.py

@@ -138,6 +138,8 @@ def migrate(node: Node, old_version: str, new_version: str) -> int:
         return migrate_3_12(node)
     elif old_version == 'v3.12' and new_version == 'v3.13':
         return migrate_3_13(node)
+    elif old_version == 'v3.14' and new_version == 'v3.15':
+        return migrate_3_15(node)
     return 0
 
 def migrate_3_11(node: Node) -> int:
@@ -162,10 +164,15 @@ def migrate_3_11(node: Node) -> int:
 
 
 def migrate_3_12(node: Node) -> int:
+    filename = os.path.join(node.config_dir, 'services', 'scheduler.yaml')
+    if os.path.exists(filename):
+        shutil.move(filename, os.path.join(node.config_dir, 'services', 'core.yaml'))
+
     filename = os.path.join(node.config_dir, 'main.yaml')
     if not os.path.exists(filename):
         node.log.error('main.yaml not found. Exiting.')
         return -2
+
     with open(filename, mode='r', encoding='utf-8') as infile:
         data = yaml.load(infile)
     if 'ovgme' in data.get('opt_plugins', []):
@@ -195,9 +202,6 @@ def migrate_3_12(node: Node) -> int:
                 yaml.dump(data, outfile)
             node.log.info("  => node.yaml auto-migrated, please check")
         return -1
-    filename = os.path.join(node.config_dir, 'services', 'scheduler.yaml')
-    if os.path.exists(filename):
-        shutil.move(filename, os.path.join(node.config_dir, 'services', 'core.yaml'))
     return 0
 
 
@@ -216,6 +220,33 @@ def migrate_3_13(node: Node) -> int:
                 shutil.move(file, new_file)
     return 0
 
+
+def migrate_3_15(node: Node) -> int:
+    file = Path(os.path.join(node.config_dir, 'nodes.yaml'))
+    nodes = yaml.load(file.read_text(encoding='utf-8'))
+    data = nodes[node.name]
+    dirty = False
+    if isinstance(data.get('DCS', {}).get('autoupdate'), dict):
+        data['DCS']['announce'] = data['DCS'].pop('autoupdate')
+        data['DCS']['autoupdate'] = True
+        dirty = True
+
+    for name, extension in data['extensions'].items():
+        if name not in ['SRS', 'LotAtc']:
+            continue
+        if isinstance(extension.get('autoupdate'), dict):
+            extension['announce'] = extension.pop('autoupdate')
+            extension['autoupdate'] = True
+            dirty = True
+
+    if dirty:
+        with open(file, mode='w', encoding='utf-8') as outfile:
+            yaml.dump(nodes, outfile)
+        node.log.info("  => node.yaml auto-migrated, please check")
+        return -1
+    return 0
+
+
 def migrate_3(node: str):
     cfg = ConfigParser()
     cfg.read('config/default.ini', encoding='utf-8')