From 9a99ea5434bf24024995e2938cace6d1d16d37bf Mon Sep 17 00:00:00 2001
From: Richard Neumann <mail@richard-neumann.de>
Date: Tue, 22 Dec 2020 22:16:15 +0100
Subject: [PATCH] Fixed readline history for Windows systems.

---
 rcon/rconshell.py | 21 ++++++++++-----------
 rcon/readline.py  | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 rcon/readline.py

diff --git a/rcon/rconshell.py b/rcon/rconshell.py
index 80cb4e6..bf107ca 100644
--- a/rcon/rconshell.py
+++ b/rcon/rconshell.py
@@ -1,16 +1,15 @@
 """An interactive RCON shell."""
 
 from argparse import ArgumentParser, Namespace
-from contextlib import suppress
 from logging import INFO, basicConfig, getLogger
 from pathlib import Path
-from readline import read_history_file, write_history_file
 from socket import timeout
 from sys import exit    # pylint: disable=W0622
 
 from rcon.errorhandler import ErrorHandler
 from rcon.exceptions import RequestIdMismatch
 from rcon.rconclt import get_credentials
+from rcon.readline import CommandHistory
 from rcon.config import CONFIG_FILE, LOG_FORMAT
 from rcon.console import PROMPT, rconcmd
 
@@ -23,7 +22,6 @@ ERRORS = (
     (RequestIdMismatch, 'Unexpected request ID mismatch.', 5)
 )
 LOGGER = getLogger('rconshell')
-HIST_FILE = Path.home().joinpath('.rconshell_history')
 
 
 def get_args() -> Namespace:
@@ -38,24 +36,25 @@ def get_args() -> Namespace:
     return parser.parse_args()
 
 
-def main():
+def run() -> int:
     """Runs the RCON shell."""
 
     args = get_args()
     basicConfig(level=INFO, format=LOG_FORMAT)
 
-    with suppress(FileNotFoundError, PermissionError):
-        read_history_file(HIST_FILE)
-
     if args.server:
         host, port, passwd = get_credentials(args)
     else:
         host = port = passwd = None
 
     with ErrorHandler(ERRORS, LOGGER):
-        exit_code = rconcmd(host, port, passwd, prompt=args.prompt)
+        return rconcmd(host, port, passwd, prompt=args.prompt)
+
+
+def main():
+    """Wraps the run function."""
 
-    with suppress(PermissionError):
-        write_history_file(HIST_FILE)
+    with CommandHistory():
+        returncode = run()
 
-    exit(exit_code)
+    exit(returncode)
diff --git a/rcon/readline.py b/rcon/readline.py
new file mode 100644
index 0000000..50a86d5
--- /dev/null
+++ b/rcon/readline.py
@@ -0,0 +1,33 @@
+"""Wrapper for readline support."""
+
+from os import name
+from pathlib import Path
+
+
+__all__ = ['CommandHistory']
+
+
+HIST_FILE = Path.home().joinpath('.rconshell_history')
+
+
+if name == 'posix':
+    from readline import read_history_file, write_history_file
+
+    class CommandHistory:
+        """Context manager for the command line history."""
+
+        def __enter__(self):
+            read_history_file()
+            return self
+
+        def __exit__(self, *_):
+            write_history_file(HIST_FILE)
+else:
+    class CommandHistory:
+        """Context manager for the command line history."""
+
+        def __enter__(self):
+            return self
+
+        def __exit__(self, *_):
+            pass