onyx_online/q3rcon-cli
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/q3rcon-cli.git synced 2026-04-17 22:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

add spinners for all commands (including interactive mode).

Browse Source 
pass send_command(interpret=True) for commands that return long responses.
note, it strips the first `"` from cvar responses which causes CVAR_REGEX to fail.
This commit is contained in:
onyx-and-iris
2026-03-23 14:45:35 +00:00
parent 3a7cc3eacb
commit d0519bb8e9
11 changed files with 99 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/q3rcon_cli/commands/fastrestart.py
View File

@@ -1,5 +1,5 @@
from aioq3rcon import Client
from clypi import Command, arg
from clypi import Command, Spinner, arg
from typing_extensions import override
from q3rcon_cli import console
@@ -14,6 +14,8 @@ class Fastrestart(Command):
@override
async def run(self):
async with Client(self.host, self.port, self.password) as client:
if response := await client.send_command('fast_restart'):
console.out.print_response(response)
async with Spinner('Executing fast restart', suffix='...'):
async with Client(self.host, self.port, self.password) as client:
response = await client.send_command('fast_restart', interpret=True)
console.out.print_response(response)

25
src/q3rcon_cli/commands/gametype.py
View File

@@ -1,5 +1,5 @@
from aioq3rcon import Client
from clypi import Command, Positional, Spinner, arg, cprint
from clypi import Command, Positional, Spinner, arg
from typing_extensions import override
from q3rcon_cli import console
@@ -24,16 +24,23 @@ class Gametype(Command):
@override
async def run(self):
if not self.new_gametype:
async with Client(self.host, self.port, self.password) as client:
if response := await client.send_command('g_gametype'):
console.out.print_cvar(response)
async with Spinner('Fetching current gametype', suffix='...'):
async with Client(self.host, self.port, self.password) as client:
response = await client.send_command('g_gametype')
console.out.print_cvar(response)
return
async with Client(self.host, self.port, self.password) as client:
await client.send_command(f'g_gametype {self.new_gametype}')
if self.force:
async with Spinner('Forcing gametype change', suffix='...'):
async with Spinner(f'Changing gametype to {self.new_gametype}', suffix='...'):
async with Client(self.host, self.port, self.password) as client:
await client.send_command(f'g_gametype {self.new_gametype}')
if self.force:
async with Spinner('Forcing gametype change', suffix='...'):
async with Client(self.host, self.port, self.password) as client:
client.timeout = 3
client.fragment_read_timeout = 1
await client.send_command('map_restart')
cprint(f'Gametype changed successfully to {self.new_gametype}.', fg='green')
console.out.print(
f'Gametype changed successfully to {self.new_gametype}.', style='green'
)

16
src/q3rcon_cli/commands/hostname.py
View File

@@ -1,5 +1,5 @@
from aioq3rcon import Client
from clypi import Command, Positional, arg, cprint
from clypi import Command, Positional, Spinner, arg
from typing_extensions import override
from q3rcon_cli import console
@@ -19,12 +19,14 @@ class Hostname(Command):
@override
async def run(self):
if not self.new_hostname:
async with Client(self.host, self.port, self.password) as client:
if response := await client.send_command('sv_hostname'):
console.out.print_cvar(response)
async with Spinner('Fetching current hostname', suffix='...'):
async with Client(self.host, self.port, self.password) as client:
response = await client.send_command('sv_hostname')
console.out.print_cvar(response)
return
async with Client(self.host, self.port, self.password) as client:
await client.send_command(f'sv_hostname {self.new_hostname}')
async with Spinner(f'Changing hostname to {self.new_hostname}', suffix='...'):
async with Client(self.host, self.port, self.password) as client:
await client.send_command(f'sv_hostname {self.new_hostname}')
cprint(f'Hostname changed to: {self.new_hostname}', fg='green')
console.out.print(f'Hostname changed to: {self.new_hostname}', style='green')

13
src/q3rcon_cli/commands/map.py
View File

@@ -1,5 +1,5 @@
from aioq3rcon import Client
from clypi import Command, Positional, Spinner, arg, cprint
from clypi import Command, Positional, Spinner, arg
from typing_extensions import override
from q3rcon_cli import console
@@ -19,9 +19,10 @@ class Map(Command):
@override
async def run(self):
if not self.new_map:
async with Client(self.host, self.port, self.password) as client:
if response := await client.send_command('mapname'):
console.out.print_cvar(response)
async with Spinner('Getting current map', suffix='...'):
async with Client(self.host, self.port, self.password) as client:
response = await client.send_command('mapname')
console.out.print_cvar(response)
return
async with Spinner('Changing map', suffix='...'):
@@ -30,4 +31,6 @@ class Map(Command):
) as client:
await client.send_command(f'map mp_{self.new_map.removeprefix("mp_")}')
cprint(f'Map changed to {self.new_map.removeprefix("mp_")}', fg='green')
console.out.print(
f'Map changed to {self.new_map.removeprefix("mp_")}', style='green'
)

10
src/q3rcon_cli/commands/mapname.py
View File

@@ -1,5 +1,5 @@
from aioq3rcon import Client
from clypi import Command, arg
from clypi import Command, Spinner, arg
from typing_extensions import override
from q3rcon_cli import console
@@ -14,6 +14,8 @@ class Mapname(Command):
@override
async def run(self):
async with Client(self.host, self.port, self.password) as client:
if response := await client.send_command('mapname'):
console.out.print_cvar(response)
async with Spinner('Getting map name...'):
async with Client(self.host, self.port, self.password) as client:
response = await client.send_command('mapname')
console.out.print_cvar(response)

7
src/q3rcon_cli/commands/maprestart.py
View File

@@ -16,7 +16,8 @@ class Maprestart(Command):
async def run(self):
async with Spinner('Restarting map', suffix='...'):
async with Client(
self.host, self.port, self.password, fragment_read_timeout=1
self.host, self.port, self.password, timeout=3, fragment_read_timeout=1
) as client:
if response := await client.send_command('map_restart'):
console.out.print_response(response)
response = await client.send_command('map_restart', interpret=True)
console.out.print_response(response)

11
src/q3rcon_cli/commands/maprotate.py
View File

@@ -16,7 +16,12 @@ class Maprotate(Command):
async def run(self):
async with Spinner('Rotating map', suffix='...'):
async with Client(
self.host, self.port, self.password, fragment_read_timeout=1
self.host,
self.port,
self.password,
timeout=3,
fragment_read_timeout=1,
) as client:
if response := await client.send_command('map_rotate'):
console.out.print_response(response)
response = await client.send_command('map_rotate', interpret=True)
console.out.print_response(response)

10
src/q3rcon_cli/commands/plugins.py
View File

@@ -1,5 +1,5 @@
from aioq3rcon import Client
from clypi import Command, arg
from clypi import Command, Spinner, arg
from typing_extensions import override
from q3rcon_cli import console
@@ -14,6 +14,8 @@ class Plugins(Command):
@override
async def run(self):
async with Client(self.host, self.port, self.password) as client:
if response := await client.send_command('plugins'):
console.out.print_response(response)
async with Spinner('Fetching plugins...'):
async with Client(self.host, self.port, self.password) as client:
response = await client.send_command('plugins')
console.out.print_response(response)

7
src/q3rcon_cli/commands/status.py
View File

@@ -16,7 +16,8 @@ class Status(Command):
async def run(self):
async with Spinner('Fetching status', suffix='...'):
async with Client(
self.host, self.port, self.password, fragment_read_timeout=0.5
self.host, self.port, self.password, fragment_read_timeout=1
) as client:
if response := await client.send_command('status'):
console.out.print_status(response)
response = await client.send_command('status')
console.out.print_status(response)