Refactored config file and servers loading.

rcon/config.py

@@ -1,27 +1,38 @@
 """RCON server configuration."""
 
 from __future__ import annotations
+from argparse import Namespace
 from configparser import ConfigParser, SectionProxy
+from getpass import getpass
 from logging import getLogger
 from os import getenv, name
 from pathlib import Path
-from typing import Dict, Iterator, NamedTuple, Tuple
+from sys import exit    # pylint: disable=W0622
+from typing import Iterable, NamedTuple, Union
 
 
-__all__ = ['CONFIG_FILE', 'LOG_FORMAT', 'Config', 'servers']
+__all__ = ['CONFIG_FILES', 'LOG_FORMAT', 'SERVERS', 'Config', 'from_args']
 
 
 CONFIG = ConfigParser()
 
 if name == 'posix':
-    CONFIG_FILE = Path('/etc/rcon.conf')
+    CONFIG_FILES = (
+        Path('/etc/rcon.conf'),
+        Path('/usr/local/etc/rcon.conf'),
+        Path.home().joinpath('.rcon.conf')
+    )
 elif name == 'nt':
-    CONFIG_FILE = Path(getenv('LOCALAPPDATA')).joinpath('rcon.conf')
+    CONFIG_FILES = (
+        Path(getenv('LOCALAPPDATA')).joinpath('rcon.conf'),
+        Path.home().joinpath('.rcon.conf')
+    )
 else:
     raise NotImplementedError(f'Unsupported operating system: {name}')
 
 LOG_FORMAT = '[%(levelname)s] %(name)s: %(message)s'
 LOGGER = getLogger('RCON Config')
+SERVERS = {}
 
 
 class Config(NamedTuple):
@@ -59,15 +70,36 @@ class Config(NamedTuple):
         return cls(host, port, passwd)
 
 
-def entries(config_parser: ConfigParser) -> Iterator[Tuple[str, Config]]:
+def load(config_files: Union[Path, Iterable[Path]] = CONFIG_FILES) -> None:
-    """Yields entries."""
+    """Reads the configuration files and populates SERVERS."""
 
-    for section in config_parser.sections():
+    SERVERS.clear()
-        yield (section, Config.from_config_section(config_parser[section]))
+    CONFIG.read(config_files)
 
+    for section in CONFIG.sections():
+        SERVERS[section] = Config.from_config_section(CONFIG[section])
 
-def servers(config_file: Path = CONFIG_FILE) -> Dict[str, Config]:
-    """Returns a dictionary of servers."""
 
-    CONFIG.read(config_file)
+def from_args(args: Namespace) -> Config:
-    return dict(entries(CONFIG))
+    """Get the credentials for a server from the respective arguments."""
+
+    try:
+        host, port, passwd = Config.from_string(args.server)
+    except ValueError:
+        load(args.config)
+
+        try:
+            host, port, passwd = SERVERS[args.server]
+        except KeyError:
+            LOGGER.error('No such server: %s.', args.server)
+            exit(2)
+
+    if passwd is None:
+        try:
+            passwd = getpass('Password: ')
+        except (KeyboardInterrupt, EOFError):
+            print()
+            LOGGER.error('Aborted by user.')
+            exit(1)
+
+    return Config(host, port, passwd)

rcon/rconclt.py

@@ -1,18 +1,15 @@
 """RCON client CLI."""
 
 from argparse import ArgumentParser, Namespace
-from getpass import getpass
 from logging import DEBUG, INFO, basicConfig, getLogger
 from pathlib import Path
-from sys import exit    # pylint: disable=W0622
-from typing import Tuple
 
 from rcon.errorhandler import ErrorHandler
-from rcon.config import CONFIG_FILE, LOG_FORMAT, Config, servers
+from rcon.config import CONFIG_FILES, LOG_FORMAT, from_args
 from rcon.proto import Client
 
 
-__all__ = ['get_credentials', 'main']
+__all__ = ['main']
 
 
 LOGGER = getLogger('rconclt')
@@ -24,7 +21,7 @@ def get_args() -> Namespace:
     parser = ArgumentParser(description='A Minecraft RCON client.')
     parser.add_argument('server', help='the server to connect to')
     parser.add_argument('-c', '--config', type=Path, metavar='file',
-                        default=CONFIG_FILE, help='the configuration file')
+                        default=CONFIG_FILES, help='the configuration file')
     parser.add_argument('-d', '--debug', action='store_true',
                         help='print additional debug information')
     parser.add_argument('-t', '--timeout', type=float, metavar='seconds',
@@ -35,35 +32,12 @@ def get_args() -> Namespace:
     return parser.parse_args()
 
 
-def get_credentials(args: Namespace) -> Tuple[str, int, str]:
-    """Get the credentials for a server from the respective server name."""
-
-    try:
-        host, port, passwd = Config.from_string(args.server)
-    except ValueError:
-        try:
-            host, port, passwd = servers(args.config)[args.server]
-        except KeyError:
-            LOGGER.error('No such server: %s.', args.server)
-            exit(2)
-
-    if passwd is None:
-        try:
-            passwd = getpass('Password: ')
-        except (KeyboardInterrupt, EOFError):
-            print()
-            LOGGER.error('Aborted by user.')
-            exit(1)
-
-    return (host, port, passwd)
-
-
 def main() -> None:
     """Runs the RCON client."""
 
     args = get_args()
     basicConfig(format=LOG_FORMAT, level=DEBUG if args.debug else INFO)
-    host, port, passwd = get_credentials(args)
+    host, port, passwd = from_args(args)
 
     with ErrorHandler(LOGGER):
         with Client(host, port, timeout=args.timeout) as client:

rcon/rconshell.py

@@ -5,9 +5,8 @@ from logging import INFO, basicConfig, getLogger
 from pathlib import Path
 
 from rcon.errorhandler import ErrorHandler
-from rcon.rconclt import get_credentials
 from rcon.readline import CommandHistory
-from rcon.config import CONFIG_FILE, LOG_FORMAT
+from rcon.config import CONFIG_FILES, LOG_FORMAT, from_args
 from rcon.console import PROMPT, rconcmd
 
 
@@ -23,7 +22,7 @@ def get_args() -> Namespace:
     parser = ArgumentParser(description='An interactive RCON shell.')
     parser.add_argument('server', nargs='?', help='the server to connect to')
     parser.add_argument('-c', '--config', type=Path, metavar='file',
-                        default=CONFIG_FILE, help='the configuration file')
+                        default=CONFIG_FILES, help='the configuration file')
     parser.add_argument('-p', '--prompt', default=PROMPT, metavar='PS1',
                         help='the shell prompt')
     return parser.parse_args()
@@ -36,7 +35,7 @@ def main() -> None:
     basicConfig(level=INFO, format=LOG_FORMAT)
 
     if args.server:
-        host, port, passwd = get_credentials(args)
+        host, port, passwd = from_args(args)
     else:
         host = port = passwd = None