Genshin-bots/GenshinUID
1
0
Fork 0
mirror of https://github.com/KimigaiiWuyi/GenshinUID.git synced 2025-05-08 04:55:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 修复启动报错, 移除错误文件, 提高资源下载延时

Browse Source
This commit is contained in:
KimigaiiWuyi 2023-10-08 02:05:12 +08:00
parent 9fd83622c4
commit 8e68a43d6a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GenshinUID/utils/resource/download_from_miniggicu.py
View File

@ -8,8 +8,9 @@ import aiohttp
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from aiohttp import TCPConnector from aiohttp import TCPConnector
from gsuid_core.logger import logger from gsuid_core.logger import logger
from aiohttp.client import ClientSession from aiohttp.client import ClientSession, ClientTimeout
from .RESOURCE_PATH import CHAR_PATH
from .download_url import PATH_MAP, download_file from .download_url import PATH_MAP, download_file
# MINIGG_FILE = 'http://file.microgg.cn/KimigaiiWuyi/resource/' # MINIGG_FILE = 'http://file.microgg.cn/KimigaiiWuyi/resource/'
@ -126,7 +127,10 @@ async def download_all_file_from_miniggicu():
failed_list: List[Tuple[str, int, str]] = [] failed_list: List[Tuple[str, int, str]] = []
TASKS = [] TASKS = []
async with ClientSession(connector=TCPConnector(verify_ssl=False)) as sess: async with ClientSession(
connector=TCPConnector(verify_ssl=False),
timeout=ClientTimeout(total=None, sock_connect=20, sock_read=200),
) as sess:
for file in [ for file in [
NAMECARD_FILE, NAMECARD_FILE,
SIDE_FILE, SIDE_FILE,
@ -201,3 +205,8 @@ async def download_all_file_from_miniggicu():
await _download(TASKS) await _download(TASKS)
if count := len(failed_list): if count := len(failed_list):
logger.error(f'{BASE_TAG}仍有{count}个文件未下载，请使用命令 `下载全部资源` 重新下载') logger.error(f'{BASE_TAG}仍有{count}个文件未下载，请使用命令 `下载全部资源` 重新下载')
for d_files in ['100000067.png', '100000068.png']:
path = CHAR_PATH / d_files
if path.exists():
path.unlink()

2
GenshinUID/utils/resource/generate_char_card.py
View File

@ -43,7 +43,7 @@ async def create_single_char_card(char_id: Union[str, int]) -> Image.Image:
if not path.exists(): if not path.exists():
logger.warning(f'资源文件夹未发现图片{char_id}....忽略加载...') logger.warning(f'资源文件夹未发现图片{char_id}....忽略加载...')
return Image.new('RGBA', (256, 310)) return Image.new('RGBA', (256, 310))
char_img = Image.open(path) char_img = Image.open(path).convert('RGBA')
char_star = avatarId2Star_data[str(char_id)] char_star = avatarId2Star_data[str(char_id)]
char_frame = Image.open(texture2d_path / 'frame.png') char_frame = Image.open(texture2d_path / 'frame.png')
char_bg = Image.open(texture2d_path / f'star{char_star}bg.png') char_bg = Image.open(texture2d_path / f'star{char_star}bg.png')