From 25e281a4c599a6e94cb224d41976ebe1ff123b73 Mon Sep 17 00:00:00 2001 From: shoucandanghehe Date: Fri, 16 Aug 2024 18:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20localstore=20=E4=B8=80=E5=BE=8B?= =?UTF-8?q?=E4=BB=8E=20config=20=E5=AF=BC=E5=85=A5=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot_plugin_tetris_stats/config/config.py | 7 +++---- nonebot_plugin_tetris_stats/utils/templates.py | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nonebot_plugin_tetris_stats/config/config.py b/nonebot_plugin_tetris_stats/config/config.py index 4f50795..457bc54 100644 --- a/nonebot_plugin_tetris_stats/config/config.py +++ b/nonebot_plugin_tetris_stats/config/config.py @@ -1,9 +1,8 @@ -from pathlib import Path - -from nonebot_plugin_localstore import get_cache_dir +from nonebot_plugin_localstore import get_cache_dir, get_data_dir from pydantic import BaseModel, Field -CACHE_PATH: Path = get_cache_dir('nonebot_plugin_tetris_stats') +CACHE_PATH = get_cache_dir('nonebot_plugin_tetris_stats') +DATA_PATH = get_data_dir('nonebot_plugin_tetris_stats') class ScopedConfig(BaseModel): diff --git a/nonebot_plugin_tetris_stats/utils/templates.py b/nonebot_plugin_tetris_stats/utils/templates.py index 7e1b808..94892bb 100644 --- a/nonebot_plugin_tetris_stats/utils/templates.py +++ b/nonebot_plugin_tetris_stats/utils/templates.py @@ -11,12 +11,13 @@ from nonebot import get_driver from nonebot.log import logger from nonebot.permission import SUPERUSER from nonebot_plugin_alconna import Alconna, Args, Option, on_alconna -from nonebot_plugin_localstore import get_cache_file, get_data_dir from rich.progress import Progress +from ..config.config import CACHE_PATH, DATA_PATH + driver = get_driver() -TEMPLATES_DIR = get_data_dir('nonebot_plugin_tetris_stats') / 'templates' +TEMPLATES_DIR = DATA_PATH / 'templates' alc = on_alconna(Alconna('更新模板', Option('--revision', Args['revision', str], alias={'-R'})), permission=SUPERUSER) @@ -36,7 +37,7 @@ async def download_templates(tag: str) -> Path: .rsplit('/', 1)[-1] ) logger.success(f'获取到的最新版本号: {tag}') - path = get_cache_file('nonebot_plugin_tetris_stats', f'dist_{time_ns()}.zip') + path = CACHE_PATH / f'dist_{time_ns()}.zip' with Progress() as progress: task_id = progress.add_task('[red]Downloading...', total=None) async with (