From 6e9c42c4ddf11c01f51e0ea00a001a1d4aef8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=9B=E6=B0=B4=E5=B1=85=E5=AE=A4?= Date: Fri, 31 Mar 2023 14:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Update=20the=20outdated=20projec?= =?UTF-8?q?t=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/dependence/assets.py | 5 ++++- core/dependence/redisdb.py | 1 - modules/gacha_log/log.py | 4 +--- modules/gacha_log/models.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/dependence/assets.py b/core/dependence/assets.py index 5316b89b..72558497 100644 --- a/core/dependence/assets.py +++ b/core/dependence/assets.py @@ -18,6 +18,7 @@ from httpx import AsyncClient, HTTPError, HTTPStatusError, TransportError, URL from typing_extensions import Self from core.base_service import BaseService +from core.config import config from metadata.genshin import AVATAR_DATA, HONEY_DATA, MATERIAL_DATA, NAMECARD_DATA, WEAPON_DATA from metadata.scripts.honey import update_honey_metadata from metadata.scripts.metadatas import update_metadata_from_ambr, update_metadata_from_github @@ -130,7 +131,9 @@ class _AssetsService(ABC): async def _download(self, url: StrOrURL, path: Path, retry: int = 5) -> Path | None: """从 url 下载图标至 path""" logger.debug("正在从 %s 下载图标至 %s", url, path) - headers = {"user-agent": "TGPaimonBot/3.0"} if URL(url).host == "enka.network" else None + headers = None + if config.enka_network_api_agent is not None and URL(url).host == "enka.network": + headers = {"user-agent": config.enka_network_api_agent} for time in range(retry): try: response = await self.client.get(url, follow_redirects=False, headers=headers) diff --git a/core/dependence/redisdb.py b/core/dependence/redisdb.py index d53e02d0..c94f067f 100644 --- a/core/dependence/redisdb.py +++ b/core/dependence/redisdb.py @@ -22,7 +22,6 @@ class RedisDB(BaseService.Dependence): ): self.client = aioredis.Redis(host=host, port=port, db=database, password=password) self.ttl = 600 - self.key_prefix = "paimon_bot" async def ping(self): # noinspection PyUnresolvedReferences diff --git a/modules/gacha_log/log.py b/modules/gacha_log/log.py index fc379271..2bf7d93e 100644 --- a/modules/gacha_log/log.py +++ b/modules/gacha_log/log.py @@ -128,9 +128,7 @@ class GachaLog: if not state: raise GachaLogNotFound save_path = self.gacha_log_path / f"{user_id}-{uid}-uigf.json" - info = UIGFModel( - info=UIGFInfo(uid=uid, export_app=ImportType.TGPaimonBot.value, export_app_version="v3"), list=[] - ) + info = UIGFModel(info=UIGFInfo(uid=uid, export_app=ImportType.PaiGram.value, export_app_version="v3"), list=[]) for items in data.item_list.values(): for item in items: info.list.append( diff --git a/modules/gacha_log/models.py b/modules/gacha_log/models.py index 805084fc..1bf6dae0 100644 --- a/modules/gacha_log/models.py +++ b/modules/gacha_log/models.py @@ -9,7 +9,7 @@ from modules.gacha_log.const import UIGF_VERSION class ImportType(Enum): - TGPaimonBot = "TGPaimonBot" + PaiGram = "PaiGram" PAIMONMOE = "PAIMONMOE" FXQ = "FXQ" UIGF = "UIGF"