Fixed rconshell prompt.

rcon/console.py

@@ -18,6 +18,7 @@ MSG_LOGIN_ABORTED = '\nLogin aborted. Bye.'
 MSG_EXIT = 'Bye.'
 MSG_SESSION_TIMEOUT = 'Session timed out. Please login again.'
 MSG_EXIT_USAGE = 'Usage: {} [<exit_code>].'
+PROMPT = 'RCON> '
 
 
 def read(prompt: str, typ: type = None) -> type:
@@ -64,10 +65,10 @@ def login(client: Client, passwd: str) -> str:
     return passwd
 
 
-def get_config(host: str, port: int, passwd: str, prompt: str) -> Config:
+def get_config(host: str, port: int, passwd: str) -> Config:
     """Reads the necessary arguments."""
 
-    while any(item is None for item in (host, port, passwd, prompt)):
+    while any(item is None for item in (host, port, passwd)):
         if host is None:
             host = read_or_none('Host: ')
 
@@ -77,10 +78,7 @@ def get_config(host: str, port: int, passwd: str, prompt: str) -> Config:
         if passwd is None:
             passwd = read_or_none('Password: ')
 
-        if prompt is None:
-            prompt = read_or_none('Prompt: ')
-
-    return Config(host, port, passwd, prompt)
+    return Config(host, port, passwd)
 
 
 def exit(exit_code: Union[int, str] = 0) -> int:    # pylint: disable=W0622
@@ -90,11 +88,11 @@ def exit(exit_code: Union[int, str] = 0) -> int:    # pylint: disable=W0622
     return int(exit_code)
 
 
-def rconcmd(host: str, port: int, passwd: str, prompt: str) -> int:
+def rconcmd(host: str, port: int, passwd: str, *, prompt: str = PROMPT) -> int:
     """Initializes the console."""
 
     try:
-        config = get_config(host, port, passwd, prompt)
+        config = get_config(host, port, passwd)
     except KeyboardInterrupt:
         print(MSG_ABORTED)
         return 1
@@ -108,7 +106,7 @@ def rconcmd(host: str, port: int, passwd: str, prompt: str) -> int:
 
         while True:
             try:
-                command = input(config.prompt)
+                command = input(prompt)
             except EOFError:
                 print(f'\n{MSG_EXIT}')
                 break

rcon/rconshell.py

@@ -9,7 +9,7 @@ from sys import exit    # pylint: disable=W0622
 from rcon.errorhandler import ErrorHandler
 from rcon.rconclt import get_credentials
 from rcon.config import CONFIG_FILE, LOG_FORMAT
-from rcon.console import rconcmd
+from rcon.console import PROMPT, rconcmd
 
 
 __all__ = ['get_args', 'main']
@@ -28,7 +28,7 @@ def get_args() -> Namespace:
     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')
-    parser.add_argument('-p', '--prompt', default='RCON> ', metavar='PS1',
+    parser.add_argument('-p', '--prompt', default=PROMPT, metavar='PS1',
                         help='the shell prompt')
     return parser.parse_args()
 
@@ -45,6 +45,6 @@ def main():
         host = port = passwd = None
 
     with ErrorHandler(ERRORS, LOGGER):
-        exit_code = rconcmd(host, port, passwd, args.prompt)
+        exit_code = rconcmd(host, port, passwd, prompt=args.prompt)
 
     exit(exit_code)