From 508dd5b38368223fb34e14bc9dc350087bdf54be Mon Sep 17 00:00:00 2001 From: fufesou <13586388+fufesou@users.noreply.github.com> Date: Sat, 3 Aug 2024 22:29:30 +0800 Subject: [PATCH] fix: custom client, msi, conn type (#8944) Signed-off-by: fufesou --- res/msi/preprocess.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/res/msi/preprocess.py b/res/msi/preprocess.py index 9a6a3bcab..a5251c1ce 100644 --- a/res/msi/preprocess.py +++ b/res/msi/preprocess.py @@ -65,10 +65,10 @@ def make_parser(): "-c", "--custom", action="store_true", help="Is custom client", default=False ) parser.add_argument( - "--custom-client-props", + "--conn-type", type=str, - default="{}", - help='Custom client properties, e.g. \'{"connection-type": "outgoing"}\'', + default="", + help='Connection type, e.g. "incoming", "outgoing". Default is empty, means incoming-outgoing', ) parser.add_argument( "--app-name", type=str, default="RustDesk", help="The app name." @@ -391,21 +391,14 @@ def gen_custom_ARPSYSTEMCOMPONENT(args, dist_dir): else: return gen_custom_ARPSYSTEMCOMPONENT_False(args) -def gen_custom_client_properties(args): - try: - props = json.loads(args.custom_client_props) - except json.JSONDecodeError as e: - print(f"Failed to decode custom props: {e}") - return False - +def gen_conn_type(args): def func(lines, index_start): indent = g_indent_unit * 3 lines_new = [] - - if 'connection-type' in props: + if args.conn_type != "": lines_new.append( - f"""{indent}\n""" + f"""{indent}\n""" ) for i, line in enumerate(lines_new): @@ -539,7 +532,7 @@ if __name__ == "__main__": if not gen_custom_ARPSYSTEMCOMPONENT(args, dist_dir): sys.exit(-1) - if not gen_custom_client_properties(args): + if not gen_conn_type(args): sys.exit(-1) if not gen_auto_component(app_name, dist_dir):