From 6a9b4ec87c076b81ed6e395b503d508d4d6a64aa Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 23:04:20 +0800 Subject: [PATCH] Add operation and type since set option is batch command --- api/s23_options.py | 2 ++ api/s23_options_util.py | 6 ++++++ api/s23_options_v3.py | 2 ++ 3 files changed, 10 insertions(+) diff --git a/api/s23_options.py b/api/s23_options.py index 3e40c28..e507812 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -4,6 +4,8 @@ from .batch_cmd import execute_batch_command def set_option(name: str, cs: ChangeSet) -> ChangeSet: + cs.operations[0]['operation'] = API_UPDATE + cs.operations[0]['type'] = 'option' new_cs = cs new_cs.merge(generate_v3(cs)) return execute_batch_command(name, new_cs) diff --git a/api/s23_options_util.py b/api/s23_options_util.py index 6e9d749..c8c8234 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -336,6 +336,9 @@ _key_map_32 = { def generate_v2(cs: ChangeSet) -> ChangeSet: op = cs.operations[0] + if op['type'] == 'option': + return cs + map = _key_map_32 cs_v2 = {} @@ -367,6 +370,9 @@ def generate_v2(cs: ChangeSet) -> ChangeSet: def generate_v3(cs: ChangeSet) -> ChangeSet: op = cs.operations[0] + if op['type'] == 'option_v3': + return cs + map = _key_map_23 cs_v3 = {} diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index 1204c9c..5df18fd 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -4,6 +4,8 @@ from .batch_cmd import execute_batch_command def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: + cs.operations[0]['operation'] = API_UPDATE + cs.operations[0]['type'] = 'option_v3' new_cs = cs new_cs.merge(generate_v2(cs)) return execute_batch_command(name, new_cs)