onyx_online/q3rcon-tui
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/q3rcon-tui.git synced 2026-04-20 02:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve data encapsulation by initialising Settings in RconApp and passing it to child objects

Browse Source 
add host, port validation functions

improve error handling for the ConfigScreen.

Pydantic validations now occur on assignment as well as creation.

minor version bump
This commit is contained in:
onyx-and-iris
2026-02-25 21:41:19 +00:00
parent 6bf16f5d50
commit f59076f0a6
6 changed files with 134 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/q3rcon_tui/writable.py
View File

@@ -3,8 +3,6 @@ import re
from rich.table import Table
from rich.text import Text
from .settings import settings
Renderable = Text | Table | str
@@ -34,15 +32,21 @@ class Writable:
r'["](?P<info>.*?)["]$'
)
def __init__(self, tui):
self._settings = tui._settings
@staticmethod
def remove_color_codes(s: str) -> str:
return Writable.RE_COLOR_CODES.sub('', s)
def parse(self, cmd, response: str, style=None) -> Renderable:
response = self.remove_color_codes(response.removeprefix('print\n'))
if settings.raw:
if self._settings.raw:
return Text(response, style=style)
if response in ['Bad rcon']:
return Text('Incorrect RCON password', style='#c73d4b')
match cmd:
case 'status':
return self.status_table(response)
@@ -66,9 +70,9 @@ class Writable:
]
for column, justify in columns:
table.add_column(column, justify=justify)
if not settings.min_status:
if not self._settings.min_status:
table.add_column('Last', justify='center')
if settings.min_status:
if self._settings.min_status:
table.add_column('IP', justify='center')
else:
table.add_column('IP:Port', justify='center')
@@ -76,7 +80,7 @@ class Writable:
('QPort', 'center'),
('Rate', 'center'),
]
if not settings.min_status:
if not self._settings.min_status:
for column, justify in columns:
table.add_column(column, justify=justify)
@@ -93,7 +97,7 @@ class Writable:
m.group('guid'),
name,
]
if settings.min_status:
if self._settings.min_status:
row.append(m.group('ip'))
else:
row.append(f'{m.group("ip")}:{m.group("port")}')