Code cleanups before release.

Author: karel26

README.md

@@ -261,7 +261,7 @@ and database names if you want to install multiple bots for multiple Discord gro
 > If you need to rename a node, just launch `install.cmd` again with the --node parameter and give it the new name.
 > You will then get a list of existing nodes and will be asked to either add a new node or rename an existing one.
 > Select rename an `existing` one and select the node to be renamed.<br>
-> This might be necessary, if your hostname changes or you move a bot from one PC to another.
+> This might be necessary, if your hostname changes, or you move a bot from one PC to another.
 
 ### Desanitization
 DCSServerBot desanitizes your MissionScripting environment. That means it changes entries in Scripts\MissionScripting.lua
@@ -718,7 +718,7 @@ In these cases, you can run the `repair.cmd` script in the DCSServerBot installa
 ---
 
 ## Backup and Restore
-The platform allows you to backup and restore your database, server configurations, or bot settings. 
+The platform allows you to back up and restore your database, server configurations, or bot settings. 
 The backup and restore functionality are accessible in the Backup [service](./services/backup/README.md) 
 and [plugin](./plugins/backup/README.md).
 

core/data/const.py

@@ -56,9 +56,9 @@ class PortType(Enum):
 class Port:
 
     def __init__(self, port: int, typ: PortType, *, public: bool = False):
-        self.port = port
-        self.typ = typ
-        self.public = public
+        self.port: int = port
+        self.typ: PortType = typ
+        self.public: bool = public
 
     def __repr__(self):
         return f'{self.port}/{self.typ.value}'
@@ -82,5 +82,5 @@ def __eq__(self, other):
             return self.port == other
         return False
 
-    def type(self):
+    def type(self) -> PortType:
         return self.typ

core/data/impl/nodeimpl.py

@@ -33,21 +33,21 @@
 from psycopg.errors import UndefinedTable, InFailedSqlTransaction, ConnectionTimeout, UniqueViolation
 from psycopg.types.json import Json
 from psycopg_pool import ConnectionPool, AsyncConnectionPool
-from typing import Awaitable, Callable, Any, cast
+from typing import Awaitable, Callable, Any
 from typing_extensions import override
 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
+from core.data.dataobject import DataObjectFactory
 from core.data.node import Node, UploadStatus, SortOrder, FatalException
 from core.data.instance import Instance
 from core.data.impl.instanceimpl import InstanceImpl
 from core.data.server import Server
 from core.data.impl.serverimpl import ServerImpl
 from core.services.registry import ServiceRegistry
-from core.utils.helper import SettingsDict, YAMLError, cache_with_expiration
+from core.utils.helper import YAMLError, cache_with_expiration
 
 # ruamel YAML support
 from ruamel.yaml import YAML

core/pubsub.py

@@ -2,7 +2,7 @@
 import zlib
 
 from contextlib import suppress
-from psycopg import sql, Connection, OperationalError, AsyncConnection
+from psycopg import sql, Connection, OperationalError, AsyncConnection, InternalError
 from typing import Callable
 
 from core.data.impl.nodeimpl import NodeImpl

core/utils/helper.py

@@ -499,14 +499,14 @@ def get_cache_key(*args, **kwargs):
         # Convert unhashable types to hashable forms
         hashable_args = []
         for k, v in bound_args.arguments.items():
-            if k not in ["interaction"]:  # Removed "self" from exclusion list
+            if k not in ["interaction"]:  # Removed "self" from the exclusion list
                 # For the self-parameter, use its id as part of the key
                 if k == "self":
                     hashable_args.append(id(v))
                 # if we have a .name element, use this as key instead
                 elif hasattr(v, "name") and not isinstance(v, (str, bytes)):
                     hashable_args.append(("name", getattr(v, "name", None)))
-                # Convert lists to tuples, and handle nested lists
+                # Convert lists to tuples and handle nested lists
                 elif isinstance(v, list):
                     hashable_args.append(tuple(tuple(x) if isinstance(x, list) else x for x in v))
                 else:
@@ -608,7 +608,7 @@ async def _get_lock(cache_key) -> asyncio.Lock:
             # Fast path
             lock = locks.get(cache_key)
             if lock is None:
-                # Create lazily; small race is fine (we only need mutual exclusion, not singletons)
+                # Create lazily; a small race is fine (we only need mutual exclusion, not singletons)
                 lock = asyncio.Lock()
                 locks[cache_key] = lock
             return lock
@@ -958,7 +958,7 @@ def deep_merge(dict1, dict2):
 
 
 def hash_password(password: str) -> str:
-    # Generate an 11 character alphanumeric string
+    # Generate an 11-character alphanumeric string
     key = ''.join(secrets.choice(string.ascii_letters + string.digits) for _ in range(11))
 
     # Create a 32-byte-digest using the "Blake2b" hash algorithm
@@ -1115,7 +1115,7 @@ def process_pattern(_next, data, search, depth, debug, **kwargs):
 class YAMLError(Exception):
     """
 
-    The `YAMLError` class is an exception class that is raised when there is an error encountered while parsing or scanning a YAML file.
+    The `YAMLError` class is an exception class raised when there is an error encountered while parsing or scanning a YAML file.
 
     **Methods:**
 

extensions/lardoon/README.md

@@ -29,7 +29,7 @@ MyNode:
           tacviewExportPath: 'G:\My Drive\Tacview Files'  # Alternative drive for tacview files (default: auto-detect from Tacview)
 ```
 Remember to add some kind of security before exposing services like that to the outside world, with, for instance,
-an nginx reverse proxy.</br>
+a nginx reverse proxy.</br>
 If you plan to build Lardoon on your own, I'd recommend the fork of [Team LimaKilo](https://github.com/team-limakilo/lardoon).
 
 > [!IMPORTANT]

extensions/tacview/extension.py

@@ -436,7 +436,7 @@ async def uninstall(self) -> bool:
                     try:
                         os.rmdir(dir_y)  # only removes empty directories
                     except OSError:
-                        pass  # directory not empty
+                        pass  # the directory is not empty
         # rewrite / remove the export.lua file
         if os.path.exists(export_file):
             async with aiofiles.open(export_file, mode='r', encoding='utf-8') as infile:

plugins/creditsystem/listener.py

@@ -310,8 +310,6 @@ async def donate(self, server: Server, player: CreditPlayer, params: list[str]):
 
     @chat_command(name="tip", help=_("Tip a GCI with points"))
     async def tip(self, server: Server, player: CreditPlayer, params: list[str]):
-        player: CreditPlayer = cast(CreditPlayer, player)
-
         if not params:
             await player.sendChatMessage(_("Usage: {prefix}{command} points [gci_number]").format(
                 prefix=self.prefix, command=self.tip.name))

plugins/help/commands.py

@@ -302,8 +302,10 @@ async def generate_commands_doc(self, interaction: discord.Interaction, fmt: Lit
                                     role: Literal['Admin', 'DCS Admin', 'DCS'] | None = None,
                                     channel: discord.TextChannel | None = None):
         class DocModal(Modal):
+            # noinspection PyTypeChecker
             header = TextInput(label="Header", default=_("## DCSServerBot Commands"), style=TextStyle.short,
                                required=True)
+            # noinspection PyTypeChecker
             intro = TextInput(label="Intro", style=TextStyle.long, required=True)
 
             def __init__(derived, role: str | None):

plugins/scheduler/commands.py

@@ -1,6 +1,4 @@
 import asyncio
-from distutils.dep_util import newer
-
 import discord
 import math
 import os