From 169b005019369ac04a10c71ca88087e90e92f467 Mon Sep 17 00:00:00 2001 From: Tarrailt Date: Sat, 1 Mar 2025 17:19:05 +0800 Subject: [PATCH 1/4] :sparkles: add config `use_cwd` --- nonebot_plugin_localstore/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nonebot_plugin_localstore/config.py b/nonebot_plugin_localstore/config.py index 59e979a..3f5ab69 100644 --- a/nonebot_plugin_localstore/config.py +++ b/nonebot_plugin_localstore/config.py @@ -5,6 +5,7 @@ class Config(BaseModel): + localstore_use_cwd: bool = False localstore_cache_dir: Optional[Path] = None localstore_config_dir: Optional[Path] = None localstore_data_dir: Optional[Path] = None From 3f7a8dd96440a020bc03d20daba5fd35f197e68f Mon Sep 17 00:00:00 2001 From: Tarrailt Date: Sat, 1 Mar 2025 17:46:26 +0800 Subject: [PATCH 2/4] use Path.cwd() if use_cwd --- nonebot_plugin_localstore/__init__.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nonebot_plugin_localstore/__init__.py b/nonebot_plugin_localstore/__init__.py index 9f08b76..3c8a652 100644 --- a/nonebot_plugin_localstore/__init__.py +++ b/nonebot_plugin_localstore/__init__.py @@ -34,17 +34,23 @@ APP_NAME = "nonebot2" BASE_CACHE_DIR = ( - user_cache_dir(APP_NAME).resolve() + (Path.cwd() / "cache") + if plugin_config.use_cwd + else user_cache_dir(APP_NAME).resolve() if plugin_config.localstore_cache_dir is None else plugin_config.localstore_cache_dir.resolve() ) BASE_CONFIG_DIR = ( - user_config_dir(APP_NAME).resolve() + (Path.cwd() / "config") + if plugin_config.use_cwd + else user_config_dir(APP_NAME).resolve() if plugin_config.localstore_config_dir is None else plugin_config.localstore_config_dir.resolve() ) BASE_DATA_DIR = ( - user_data_dir(APP_NAME).resolve() + (Path.cwd() / "data") + if plugin_config.use_cwd + else user_data_dir(APP_NAME).resolve() if plugin_config.localstore_data_dir is None else plugin_config.localstore_data_dir.resolve() ) From f73f6d43dcada14dd3872a475a82cb30440d0f52 Mon Sep 17 00:00:00 2001 From: Tarrailt Date: Sat, 1 Mar 2025 17:48:29 +0800 Subject: [PATCH 3/4] :bug: missing prefix --- nonebot_plugin_localstore/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nonebot_plugin_localstore/__init__.py b/nonebot_plugin_localstore/__init__.py index 3c8a652..df9cf5f 100644 --- a/nonebot_plugin_localstore/__init__.py +++ b/nonebot_plugin_localstore/__init__.py @@ -35,21 +35,21 @@ APP_NAME = "nonebot2" BASE_CACHE_DIR = ( (Path.cwd() / "cache") - if plugin_config.use_cwd + if plugin_config.localstore_use_cwd else user_cache_dir(APP_NAME).resolve() if plugin_config.localstore_cache_dir is None else plugin_config.localstore_cache_dir.resolve() ) BASE_CONFIG_DIR = ( (Path.cwd() / "config") - if plugin_config.use_cwd + if plugin_config.localstore_use_cwd else user_config_dir(APP_NAME).resolve() if plugin_config.localstore_config_dir is None else plugin_config.localstore_config_dir.resolve() ) BASE_DATA_DIR = ( (Path.cwd() / "data") - if plugin_config.use_cwd + if plugin_config.localstore_use_cwd else user_data_dir(APP_NAME).resolve() if plugin_config.localstore_data_dir is None else plugin_config.localstore_data_dir.resolve() From f8111d28a75ac967cc3b41d7941bdf8c4d2f6acd Mon Sep 17 00:00:00 2001 From: Ju4tCode <42488585+yanyongyu@users.noreply.github.com> Date: Sat, 1 Mar 2025 10:10:25 +0000 Subject: [PATCH 4/4] :art: format code --- nonebot_plugin_localstore/__init__.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/nonebot_plugin_localstore/__init__.py b/nonebot_plugin_localstore/__init__.py index df9cf5f..f264dd2 100644 --- a/nonebot_plugin_localstore/__init__.py +++ b/nonebot_plugin_localstore/__init__.py @@ -34,23 +34,29 @@ APP_NAME = "nonebot2" BASE_CACHE_DIR = ( - (Path.cwd() / "cache") - if plugin_config.localstore_use_cwd - else user_cache_dir(APP_NAME).resolve() + ( + (Path.cwd() / "cache") + if plugin_config.localstore_use_cwd + else user_cache_dir(APP_NAME).resolve() + ) if plugin_config.localstore_cache_dir is None else plugin_config.localstore_cache_dir.resolve() ) BASE_CONFIG_DIR = ( - (Path.cwd() / "config") - if plugin_config.localstore_use_cwd - else user_config_dir(APP_NAME).resolve() + ( + (Path.cwd() / "config") + if plugin_config.localstore_use_cwd + else user_config_dir(APP_NAME).resolve() + ) if plugin_config.localstore_config_dir is None else plugin_config.localstore_config_dir.resolve() ) BASE_DATA_DIR = ( - (Path.cwd() / "data") - if plugin_config.localstore_use_cwd - else user_data_dir(APP_NAME).resolve() + ( + (Path.cwd() / "data") + if plugin_config.localstore_use_cwd + else user_data_dir(APP_NAME).resolve() + ) if plugin_config.localstore_data_dir is None else plugin_config.localstore_data_dir.resolve() )