From ee3f9ebceaf8b35941b41bf5111409c9989f1fdd Mon Sep 17 00:00:00 2001 From: streetycat <305190374@qq.com> Date: Wed, 20 Sep 2023 08:45:53 +0000 Subject: [PATCH] adapt to new value name --- aios_shell_history.txt | 21 +++++++++++++++++++++ src/aios_kernel/storage.py | 4 +--- src/service/aios_shell/aios_shell.py | 12 +++++------- src/service/aios_shell/proxy.py | 2 +- 4 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 aios_shell_history.txt diff --git a/aios_shell_history.txt b/aios_shell_history.txt new file mode 100644 index 0000000..830345a --- /dev/null +++ b/aios_shell_history.txt @@ -0,0 +1,21 @@ + +# 2023-09-20 08:41:50.636730 ++/set_config proxy + +# 2023-09-20 08:42:18.936143 ++/open math_school 小学老师 + +# 2023-09-20 08:42:23.884698 ++3+5=8 + +# 2023-09-20 08:43:13.219129 ++/set_config proxy + +# 2023-09-20 08:43:23.430306 ++socks5@192.168.100.91:1080@zhangzhen@123456 + +# 2023-09-20 08:43:35.319913 ++/open math_school 小学老师 + +# 2023-09-20 08:43:41.557234 ++3+5=8 diff --git a/src/aios_kernel/storage.py b/src/aios_kernel/storage.py index dfebefe..5119167 100644 --- a/src/aios_kernel/storage.py +++ b/src/aios_kernel/storage.py @@ -97,9 +97,7 @@ class UserConfig: raise Exception("user config key %s not exist",key) if config_item.value is None: - default_config_item = config_item.clone() - default_config_item.value = config_item.default_value - return default_config_item + return config_item.default_value return config_item.value diff --git a/src/service/aios_shell/aios_shell.py b/src/service/aios_shell/aios_shell.py index 4d054fb..41f24a0 100644 --- a/src/service/aios_shell/aios_shell.py +++ b/src/service/aios_shell/aios_shell.py @@ -194,15 +194,13 @@ class AIOS_Shell: if len(args) == 1: key = args[0] config_item = AIStorage.get_instance().get_user_config().get_config_item(key) + old_value = AIStorage.get_instance().get_user_config().get_value(key) - old_value = None if config_item is not None: - old_value = config_item.value - - value = await session.prompt_async(f"{key} : {config_item.desc} \nCurrent : {old_value}\nPlease input new value:",style=shell_style) - AIStorage.get_instance().get_user_config().set_value(key,value) - await AIStorage.get_instance().get_user_config().save_to_user_config() - show_text = FormattedText([("class:title", f"set {key} to {value} success!")]) + value = await session.prompt_async(f"{key} : {config_item.desc} \nCurrent : {old_value}\nPlease input new value:",style=shell_style) + AIStorage.get_instance().get_user_config().set_value(key,value) + await AIStorage.get_instance().get_user_config().save_to_user_config() + show_text = FormattedText([("class:title", f"set {key} to {value} success!")]) return show_text case 'connect': diff --git a/src/service/aios_shell/proxy.py b/src/service/aios_shell/proxy.py index ec07eb3..caf006d 100644 --- a/src/service/aios_shell/proxy.py +++ b/src/service/aios_shell/proxy.py @@ -11,7 +11,7 @@ sys.path.append(directory + '/../../') from aios_kernel import AIStorage def apply_storage(): - proxy_cfg = AIStorage.get_instance().get_user_config().get_user_config("proxy") + proxy_cfg = AIStorage.get_instance().get_user_config().get_config_item("proxy") if proxy_cfg is None: return