Removed DCS dependency from the bot (for Linux, DCS-less installations)

Author: karel26

core/data/impl/instanceimpl.py

@@ -90,6 +90,8 @@ def set_server(self, server: Optional["Server"]):
         self.update_server(server)
 
     def prepare(self):
+        if 'DCS' not in self.node.locals:
+            return
         # desanitisation of Slmod (if there)
         if self.node.locals['DCS'].get('desanitize', True):
             # check for SLmod and desanitize its MissionScripting.lua

core/data/impl/nodeimpl.py

@@ -128,7 +128,8 @@ async def __aexit__(self, type, value, traceback):
         await self.close_db()
 
     async def post_init(self):
-        await self.get_dcs_branch_and_version()
+        if 'DCS' in self.locals:
+            await self.get_dcs_branch_and_version()
         self.pool, self.apool = await self.init_db()
         try:
             self._master = await self.heartbeat()
@@ -229,11 +230,12 @@ def read_locals(self) -> dict:
                         f"{url.scheme}://{url.username}:SECRET@{url.hostname}:{port}{url.path}?sslmode=prefer"
                     dirty = True
                     self.log.info("Database password found, removing it from config.")
-            password = node['DCS'].pop('dcs_password', node['DCS'].pop('password', None))
-            if password:
-                node['DCS']['user'] = node['DCS'].pop('dcs_user', node['DCS'].get('user'))
-                utils.set_password('DCS', password, self.config_dir)
-                dirty = True
+            if 'DCS' in node:
+                password = node['DCS'].pop('dcs_password', node['DCS'].pop('password', None))
+                if password:
+                    node['DCS']['user'] = node['DCS'].pop('dcs_user', node['DCS'].get('user'))
+                    utils.set_password('DCS', password, self.config_dir)
+                    dirty = True
             if dirty:
                 with open(config_file, 'w', encoding='utf-8') as f:
                     yaml.dump(data, f)
@@ -613,18 +615,19 @@ async def register(self):
         if not self._public_ip:
             self._public_ip = await utils.get_public_ip()
             self.log.info(f"- Public IP registered as: {self.public_ip}")
-        if self.locals['DCS'].get('autoupdate', False):
-            if not self.locals['DCS'].get('cloud', False) or self.master:
-                self.autoupdate.start()
-        else:
-            branch, old_version = await self.get_dcs_branch_and_version()
-            try:
-                new_version = await self.get_latest_version(branch)
-                if new_version and old_version != new_version:
-                    self.log.warning(
-                        f"- Your DCS World version is outdated. Consider upgrading to version {new_version}.")
-            except Exception:
-                self.log.warning("Version check failed, possible auth-server outage.")
+        if 'DCS' in self.locals:
+            if self.locals['DCS'].get('autoupdate', False):
+                if not self.locals['DCS'].get('cloud', False) or self.master:
+                    self.autoupdate.start()
+            else:
+                branch, old_version = await self.get_dcs_branch_and_version()
+                try:
+                    new_version = await self.get_latest_version(branch)
+                    if new_version and old_version != new_version:
+                        self.log.warning(
+                            f"- Your DCS World version is outdated. Consider upgrading to version {new_version}.")
+                except Exception:
+                    self.log.warning("Version check failed, possible auth-server outage.")
 
     async def unregister(self):
         async with self.apool.connection() as conn:

plugins/cloud/commands.py

@@ -378,7 +378,10 @@ async def register(self):
                     num_bots = row[0]
                     num_servers = row[1]
         try:
-            _, dcs_version = await self.node.get_dcs_branch_and_version()
+            if 'DCS' in self.node.locals:
+                _, dcs_version = await self.node.get_dcs_branch_and_version()
+            else:
+                dcs_version = ""
             # noinspection PyUnresolvedReferences
             bot = {
                 "guild_id": self.bot.guilds[0].id,

plugins/funkman/listener.py

@@ -20,10 +20,13 @@ class FunkManEventListener(EventListener):
     def __init__(self, plugin: Plugin):
         super().__init__(plugin)
         self.config = self.get_config()
-        path = self.config['install']
-        if not os.path.exists(path):
-            self.log.error(f"FunkMan install path is not correct in your {self.plugin_name}.yaml! "
-                           f"FunkMan will not work.")
+        path = self.config.get('install')
+        if not path:
+            self.log.error(f"FunkMan install path is not set correct in the DEFAULT-section of your "
+                           f"{self.plugin_name}.yaml! FunkMan will not work.")
+            return
+        elif not os.path.exists(path):
+            self.log.error(f"FunkMan is not installed in {path}! FunkMan will not work.")
             return
         sys.path.append(path)
         from funkman.utils.utils import _GetVal

services/servicebus/service.py

@@ -46,7 +46,7 @@ def __init__(self, node):
         self.servers: dict[str, Server] = ThreadSafeDict()
         self.udp_server = None
         self.executor = None
-        if self.node.locals['DCS'].get('desanitize', True):
+        if 'DCS' in self.locals and self.node.locals['DCS'].get('desanitize', True):
             if not self.node.locals['DCS'].get('cloud', False) or self.master:
                 utils.desanitize(self)
         self.loop = asyncio.get_event_loop()