1
0
Fork 0

Merging upstream version 1.14.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 17:22:03 +01:00
parent 455e66126a
commit cd1500a24a
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
19 changed files with 152 additions and 114 deletions

View file

@ -61,8 +61,8 @@ def greetings():
reason = ""
server_version = f"redis-server {config.version} {reason}"
home_page = "Home: https://iredis.io"
issues = "Issues: https://iredis.io/issues"
home_page = "Home: https://iredis.xbin.io/"
issues = "Issues: https://github.com/laixintao/iredis/issues"
display = "\n".join([iredis_version, server_version, home_page, issues])
if config.raw:
display = display.encode()
@ -177,9 +177,9 @@ def repl(client, session, start_time):
try:
command = session.prompt(
prompt_message(client),
bottom_toolbar=BottomToolbar(command_holder).render
if config.bottom_bar
else None,
bottom_toolbar=(
BottomToolbar(command_holder).render if config.bottom_bar else None
),
input_processors=[
UpdateBottomProcessor(command_holder, session),
PasswordProcessor(),
@ -274,6 +274,12 @@ VERIFY_SSL_HELP = """Set the TLS certificate verification strategy"""
@click.option("--rainbow/--no-rainbow", default=None, is_flag=True, help=RAINBOW)
@click.option("--shell/--no-shell", default=None, is_flag=True, help=SHELL)
@click.option("--pager/--no-pager", default=None, is_flag=True, help=PAGER_HELP)
@click.option(
"--greetings/--no-greetings",
default=None,
is_flag=True,
help="Enable or disable greeting messages",
)
@click.option(
"--verify-ssl",
default=None,
@ -309,6 +315,7 @@ def gather_args(
socket,
shell,
pager,
greetings,
verify_ssl,
prompt,
):
@ -354,6 +361,8 @@ def gather_args(
config.enable_pager = pager
if verify_ssl is not None:
config.verify_ssl = verify_ssl
if greetings is not None:
config.greetings = greetings
return ctx
@ -492,5 +501,6 @@ def main():
)
# print hello message
greetings()
if config.greetings:
greetings()
repl(client, session, enter_main_time)