CHANGES:

- run.py now detects, if libraries are missing and installs them automatically.

Author: karel26

core/commandline.py

@@ -23,6 +23,8 @@
         parser.add_argument('-n', '--node', help='Node name', default=platform.node())
         parser.add_argument('-r', '--no-restart', action='store_true', default=False,
                             help="don't start DCSServerBot after the update")
+        parser.add_argument('-i', '--install', action='store_true', default=False,
+                            help='Install requirements.txt only')
     elif program == 'install.py':
         parser.add_argument('-n', '--node', help='Node name', default=platform.node())
         parser.add_argument('-u', '--user', help='Database username', default='dcsserverbot')

core/data/impl/nodeimpl.py

@@ -96,12 +96,23 @@ def __init__(self, name: str, config_dir: Optional[str] = 'config'):
         self.before_update: dict[str, Callable[[], Awaitable[Any]]] = {}
         self.after_update: dict[str, Callable[[], Awaitable[Any]]] = {}
         self.locals = self.read_locals()
+        self.db_version = None
+        self.pool: Optional[ConnectionPool] = None
+        self.apool: Optional[AsyncConnectionPool] = None
+        self._master = None
+        self.listen_address = self.locals.get('listen_address', '127.0.0.1')
+        if self.listen_address != '127.0.0.1':
+            self.log.warning(
+                'Please consider changing the listen_address in your nodes.yaml to 127.0.0.1 for security reasons!')
+        self.listen_port = self.locals.get('listen_port', 10042)
+
+    async def __aenter__(self):
         if sys.platform == 'win32':
             from os import system
             system(f"title DCSServerBot v{self.bot_version}.{self.sub_version} - {self.node.name}")
         self.log.info(f'DCSServerBot v{self.bot_version}.{self.sub_version} starting up ...')
         self.log.info(f'- Python version {platform.python_version()} detected.')
-        self.install_plugins()
+        await asyncio.to_thread(self.install_plugins)
         self.plugins: list[str] = [x.lower() for x in self.config.get('plugins', DEFAULT_PLUGINS)]
         for plugin in [x.lower() for x in self.config.get('opt_plugins', [])]:
             if plugin not in self.plugins:
@@ -110,17 +121,6 @@ def __init__(self, name: str, config_dir: Optional[str] = 'config'):
         if 'cloud' in self.plugins:
             self.plugins.remove('cloud')
             self.plugins.append('cloud')
-        self.db_version = None
-        self.pool: Optional[ConnectionPool] = None
-        self.apool: Optional[AsyncConnectionPool] = None
-        self._master = None
-        self.listen_address = self.locals.get('listen_address', '127.0.0.1')
-        if self.listen_address != '127.0.0.1':
-            self.log.warning(
-                'Please consider changing the listen_address in your nodes.yaml to 127.0.0.1 for security reasons!')
-        self.listen_port = self.locals.get('listen_port', 10042)
-
-    async def __aenter__(self):
         return self
 
     async def __aexit__(self, type, value, traceback):

run.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+# Default imports
 import asyncio
 import certifi
 import discord
@@ -11,20 +12,29 @@
 import sys
 import time
 
-from core import (
-    NodeImpl, ServiceRegistry, ServiceInstallationError, utils, YAMLError, FatalException, COMMAND_LINE_ARGS,
-    CloudRotatingFileHandler
-)
 from datetime import datetime
-from pid import PidFile, PidFileError
-from rich import print
-from rich.console import Console
-from rich.logging import RichHandler
-from rich.text import Text
 
-# ruamel YAML support
-from ruamel.yaml import YAML
-yaml = YAML()
+# DCSServerBot imports
+try:
+    from core import (
+        NodeImpl, ServiceRegistry, ServiceInstallationError, utils, YAMLError, FatalException, COMMAND_LINE_ARGS,
+        CloudRotatingFileHandler
+    )
+    from pid import PidFile, PidFileError
+    from rich import print
+    from rich.console import Console
+    from rich.logging import RichHandler
+    from rich.text import Text
+
+    # ruamel YAML support
+    from ruamel.yaml import YAML
+    yaml = YAML()
+except ModuleNotFoundError as ex:
+    import subprocess
+
+    print(f"Module {ex.name} is not installed, fixing ...")
+    subprocess.run([sys.executable, '-m', 'pip', 'install', '-r', 'requirements.txt'])
+    exit(-1)
 
 LOGLEVEL = {
     'DEBUG': logging.DEBUG,

update.py

@@ -17,6 +17,10 @@
 from version import __version__
 
 
+def install_requirements() -> int:
+    return subprocess.run([sys.executable, '-m', 'pip', 'install', '-r', 'requirements.txt'])
+
+
 def do_update_git() -> int:
     import git
 
@@ -38,7 +42,7 @@ def do_update_git() -> int:
                     print('  => DCSServerBot updated to the latest version.')
                     if modules:
                         print('  => requirements.txt has changed. Installing missing modules...')
-                        rc = subprocess.run([sys.executable, '-m', 'pip', 'install', '-r', 'requirements.txt'])
+                        rc = install_requirements()
                         if rc.returncode:
                             print('  => Autoupdate failed!')
                             print('     Please run update.cmd manually.')
@@ -142,7 +146,7 @@ def do_update_github() -> int:
 
                             # move file
                             shutil.copy2(old_file_path, new_file_path)
-            rc = subprocess.run([sys.executable, '-m', 'pip', 'install', '-r', 'requirements.txt'])
+            rc = install_requirements()
             if rc.returncode:
                 print('  => Autoupdate failed!')
                 return -1
@@ -156,7 +160,15 @@ def do_update_github() -> int:
     # get the command line args from core
     args = COMMAND_LINE_ARGS
     try:
-        rc = do_update_git()
+        if args.install:
+            rc = install_requirements()
+            if rc.returncode:
+                print("Unable to install or update 'requirements.txt'. Please try installing it manually.")
+                print("To do so, open 'cmd.exe' in the DCSServerBot installation directory, and type:")
+                print('"%USERPROFILE%\\.dcssb\\Script\\pip" install -r requirements.txt')
+                exit(-2)
+        else:
+            rc = do_update_git()
     except ImportError:
         rc = do_update_github()
     if args.no_restart: