From 7389394ff067c62ffddfc262dcc6eec625cba73e Mon Sep 17 00:00:00 2001
From: Michael Woods <alienhunter3@gmail.com>
Date: Tue, 18 Feb 2025 22:40:22 -0500
Subject: [PATCH] Changes to end handling. more

---
 src/packetserver/client/cli/__init__.py | 22 ++++++----------------
 src/packetserver/client/cli/util.py     | 12 ++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/packetserver/client/cli/__init__.py b/src/packetserver/client/cli/__init__.py
index 2aa354f..262ad3b 100644
--- a/src/packetserver/client/cli/__init__.py
+++ b/src/packetserver/client/cli/__init__.py
@@ -3,7 +3,7 @@ from packetserver.client.cli.config import get_config, default_app_dir, config_p
 from packetserver.client.cli.constants import DEFAULT_DB_FILE
 from packetserver.client import Client
 from packetserver.common.constants import yes_values
-from packetserver.client.cli.util import format_list_dicts
+from packetserver.client.cli.util import format_list_dicts, exit_client
 import ZODB
 import ZODB.FileStorage
 import ax25
@@ -14,11 +14,10 @@ from pathlib import Path
 from packetserver.client import Client
 from packetserver.client import users
 from packetserver.client.users import get_user_by_username, UserWrapper
+from
 
 VERSION="0.1.0-alpha"
 
-
-
 @click.group()
 @click.option('--conf', default=config_path(), help='path to configfile')
 @click.option('--server', '-s', default='', help="server radio callsign to connect to (required)")
@@ -88,12 +87,6 @@ def cli(ctx, conf, server, agwpe, port, callsign):
     ctx.obj['bbs'] = server
     ctx.obj['db'] = db
 
-@cli.result_callback()
-@click.pass_context
-def cli_callback(result, ctx):
-    ctx.obj['client'].stop()
-    sys.exit(result)
-
 
 @click.command()
 @click.argument('username', required=False, default='')
@@ -106,12 +99,10 @@ def user(ctx, list_users, output_format, username):
     client = ctx.obj['client']
     # validate args
     if list_users and (username.strip() != ""):
-        click.echo("Can't specify a username while listing all users.", err=True)
-        return 1
+        exit_client(client,1, "Can't specify a username while listing all users.")
 
     if not list_users and (username.strip() == ""):
-        click.echo("Must provide either a username or --list-users flag.", err=True)
-        return 1
+        exit_client(client,1, message="Must provide either a username or --list-users flag.")
 
     output_objects = []
     try:
@@ -120,13 +111,12 @@ def user(ctx, list_users, output_format, username):
         else:
             output_objects.append(users.get_user_by_username(client, ctx.obj['bbs'], username))
     except Exception as e:
-        click.echo(str(e), err=True)
-        return 1
+        exit_client(client,1, str(e))
     finally:
         client.stop()
 
     click.echo(format_list_dicts([x.pretty_dict() for x in output_objects], output_format=output_format.lower()))
-    return 1
+    exit_client(client, 0)
 
 cli.add_command(user)
 
diff --git a/src/packetserver/client/cli/util.py b/src/packetserver/client/cli/util.py
index 0fe56ad..2a01b82 100644
--- a/src/packetserver/client/cli/util.py
+++ b/src/packetserver/client/cli/util.py
@@ -1,5 +1,8 @@
 from tabulate import tabulate
 import json
+import click
+from packetserver.client import Client
+import sys
 
 def format_list_dicts(dicts: list[dict], output_format: str = "table"):
     if output_format == "table":
@@ -19,6 +22,15 @@ def format_list_dicts(dicts: list[dict], output_format: str = "table"):
     else:
         raise ValueError("Unsupported format type.")
 
+def exit_client(client: Client, return_code: int, message=""):
+    client.stop()
+    if return_code == 0:
+        is_err = False
+    else:
+        is_err = True
+    if message.strip() != "":
+        click.echo(message, err=is_err)
+    sys.exit(return_code)