mirror of
https://github.com/KimigaiiWuyi/GenshinUID.git
synced 2025-05-07 04:03:45 +08:00
🚀 将资源下载方法改为调用GsCore方法, 并更换资源站
This commit is contained in:
KimigaiiWuyi
parent
cd28b84187
commit
dcf836bdb7
@ -1,33 +1 @@
|
|||||||
import asyncio
|
from .main import all_start as AST # noqa: F401
|
||||||
import threading
|
|
||||||
|
|
||||||
from gsuid_core.logger import logger
|
|
||||||
|
|
||||||
from ..genshinuid_resource import startup
|
|
||||||
from ..genshinuid_xkdata import draw_xk_abyss_img
|
|
||||||
from ..genshinuid_guide.get_new_abyss_data import download_Oceanid
|
|
||||||
|
|
||||||
# from ..genshinuid_enka.start import check_artifacts_list
|
|
||||||
# from ..genshinuid_guide.get_abyss_data import generate_data
|
|
||||||
from ..utils.resource.generate_char_card import create_all_char_card
|
|
||||||
from ..genshinuid_xkdata.get_all_char_data import (
|
|
||||||
save_all_char_info,
|
|
||||||
save_all_abyss_rank,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def all_start():
|
|
||||||
try:
|
|
||||||
await download_Oceanid()
|
|
||||||
await startup()
|
|
||||||
# await check_artifacts_list()
|
|
||||||
await create_all_char_card()
|
|
||||||
await draw_xk_abyss_img()
|
|
||||||
# await generate_data()
|
|
||||||
await save_all_char_info()
|
|
||||||
await save_all_abyss_rank()
|
|
||||||
except Exception as e:
|
|
||||||
logger.exception(e)
|
|
||||||
|
|
||||||
|
|
||||||
threading.Thread(target=lambda: asyncio.run(all_start()), daemon=True).start()
|
|
||||||
|
|||||||
33
GenshinUID/genshinuid_start/main.py
Normal file
33
GenshinUID/genshinuid_start/main.py
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import asyncio
|
||||||
|
import threading
|
||||||
|
|
||||||
|
from gsuid_core.logger import logger
|
||||||
|
|
||||||
|
from ..genshinuid_resource import startup
|
||||||
|
from ..genshinuid_xkdata import draw_xk_abyss_img
|
||||||
|
from ..genshinuid_guide.get_new_abyss_data import download_Oceanid
|
||||||
|
|
||||||
|
# from ..genshinuid_enka.start import check_artifacts_list
|
||||||
|
# from ..genshinuid_guide.get_abyss_data import generate_data
|
||||||
|
from ..utils.resource.generate_char_card import create_all_char_card
|
||||||
|
from ..genshinuid_xkdata.get_all_char_data import (
|
||||||
|
save_all_char_info,
|
||||||
|
save_all_abyss_rank,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def all_start():
|
||||||
|
try:
|
||||||
|
await download_Oceanid()
|
||||||
|
await startup()
|
||||||
|
# await check_artifacts_list()
|
||||||
|
await create_all_char_card()
|
||||||
|
await draw_xk_abyss_img()
|
||||||
|
# await generate_data()
|
||||||
|
await save_all_char_info()
|
||||||
|
await save_all_abyss_rank()
|
||||||
|
except Exception as e:
|
||||||
|
logger.exception(e)
|
||||||
|
|
||||||
|
|
||||||
|
threading.Thread(target=lambda: asyncio.run(all_start()), daemon=True).start()
|
||||||
@ -1,211 +1,35 @@
|
|||||||
import os
|
from gsuid_core.utils.download_resource.download_core import download_all_file
|
||||||
import time
|
|
||||||
import asyncio
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Dict, List, Tuple
|
|
||||||
|
|
||||||
import aiohttp
|
from .RESOURCE_PATH import (
|
||||||
from bs4 import BeautifulSoup
|
REF_PATH,
|
||||||
from aiohttp import TCPConnector
|
REL_PATH,
|
||||||
from gsuid_core.logger import logger
|
CHAR_PATH,
|
||||||
from aiohttp.client import ClientSession, ClientTimeout
|
ICON_PATH,
|
||||||
|
GUIDE_PATH,
|
||||||
from .RESOURCE_PATH import CHAR_PATH
|
WEAPON_PATH,
|
||||||
from .download_url import PATH_MAP, download_file
|
CHAR_SIDE_PATH,
|
||||||
|
GACHA_IMG_PATH,
|
||||||
# MINIGG_FILE = 'http://file.microgg.cn/KimigaiiWuyi/resource/'
|
CHAR_STAND_PATH,
|
||||||
BASE_TAG = '[HKFRP]'
|
CHAR_NAMECARD_PATH,
|
||||||
BASE_URL = 'http://hk-1.5gbps-2.lcf.icu:10200/'
|
)
|
||||||
|
|
||||||
|
|
||||||
async def check_url(tag: str, url: str):
|
|
||||||
async with aiohttp.ClientSession() as session:
|
|
||||||
try:
|
|
||||||
start_time = time.time()
|
|
||||||
async with session.get(url) as response:
|
|
||||||
elapsed_time = time.time() - start_time
|
|
||||||
if response.status == 200:
|
|
||||||
logger.info(f'{tag} {url} {elapsed_time}')
|
|
||||||
return tag, url, elapsed_time
|
|
||||||
else:
|
|
||||||
logger.info(f'{tag} {url} 超时...')
|
|
||||||
return tag, url, float('inf')
|
|
||||||
except aiohttp.ClientError:
|
|
||||||
logger.info(f'{tag} {url} 超时...')
|
|
||||||
return tag, url, float('inf')
|
|
||||||
|
|
||||||
|
|
||||||
async def find_fastest_url(urls: Dict[str, str]):
|
|
||||||
tasks = []
|
|
||||||
for tag in urls:
|
|
||||||
tasks.append(asyncio.create_task(check_url(tag, urls[tag])))
|
|
||||||
|
|
||||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
|
||||||
fastest_tag = None
|
|
||||||
fastest_url = None
|
|
||||||
fastest_time = float('inf')
|
|
||||||
|
|
||||||
for result in results:
|
|
||||||
if isinstance(result, Exception):
|
|
||||||
continue
|
|
||||||
tag, url, elapsed_time = result
|
|
||||||
if elapsed_time < fastest_time:
|
|
||||||
fastest_url = url
|
|
||||||
fastest_time = elapsed_time
|
|
||||||
fastest_tag = tag
|
|
||||||
|
|
||||||
return fastest_tag, fastest_url
|
|
||||||
|
|
||||||
|
|
||||||
async def check_speed():
|
|
||||||
logger.info('[gsuid资源下载]测速中...')
|
|
||||||
|
|
||||||
URL_LIB = {
|
|
||||||
'[HKFRP]': 'http://hk-1.5gbps-2.lcf.icu:10200/',
|
|
||||||
'[qxqx]': 'https://kr-arm.qxqx.me/GenshinUID/',
|
|
||||||
}
|
|
||||||
|
|
||||||
global BASE_TAG
|
|
||||||
global BASE_URL
|
|
||||||
BASE_TAG, BASE_URL = await find_fastest_url(URL_LIB)
|
|
||||||
logger.info(f"最快资源站: {BASE_TAG} {BASE_URL}")
|
|
||||||
|
|
||||||
|
|
||||||
async def _get_url(url: str, sess: ClientSession):
|
|
||||||
req = await sess.get(url=url)
|
|
||||||
return await req.read()
|
|
||||||
|
|
||||||
|
|
||||||
async def download_all_file_from_miniggicu():
|
async def download_all_file_from_miniggicu():
|
||||||
await check_speed()
|
await download_all_file(
|
||||||
RESOURCE_FILE = f'{BASE_URL}/resource/'
|
'GenshinUID',
|
||||||
WIKI_FILE = f'{BASE_URL}/wiki/'
|
{
|
||||||
|
'resource/char_namecard': CHAR_NAMECARD_PATH,
|
||||||
NAMECARD_FILE = RESOURCE_FILE + 'char_namecard'
|
'resource/char_side': CHAR_SIDE_PATH,
|
||||||
SIDE_FILE = RESOURCE_FILE + 'char_side'
|
'resource/char_stand': CHAR_STAND_PATH,
|
||||||
STAND_FILE = RESOURCE_FILE + 'char_stand'
|
'resource/chars': CHAR_PATH,
|
||||||
CHARS_FILE = RESOURCE_FILE + 'chars'
|
'resource/gacha_img': GACHA_IMG_PATH,
|
||||||
GACHA_FILE = RESOURCE_FILE + 'gacha_img'
|
'resource/icon': ICON_PATH,
|
||||||
ICON_FILE = RESOURCE_FILE + 'icon'
|
'resource/reliquaries': REL_PATH,
|
||||||
REL_FILE = RESOURCE_FILE + 'reliquaries'
|
'resource/weapon': WEAPON_PATH,
|
||||||
WEAPON_FILE = RESOURCE_FILE + 'weapon'
|
'wiki/guide': GUIDE_PATH,
|
||||||
GUIDE_FILE = WIKI_FILE + 'guide'
|
'wiki/ref': REF_PATH,
|
||||||
REF_FILE = WIKI_FILE + 'ref'
|
},
|
||||||
|
|
||||||
FILE_TO_PATH = {
|
|
||||||
NAMECARD_FILE: 6,
|
|
||||||
SIDE_FILE: 3,
|
|
||||||
STAND_FILE: 2,
|
|
||||||
CHARS_FILE: 1,
|
|
||||||
GACHA_FILE: 4,
|
|
||||||
ICON_FILE: 8,
|
|
||||||
REL_FILE: 7,
|
|
||||||
WEAPON_FILE: 5,
|
|
||||||
GUIDE_FILE: 10,
|
|
||||||
REF_FILE: 12,
|
|
||||||
}
|
|
||||||
|
|
||||||
FILE_TO_NAME = {
|
|
||||||
NAMECARD_FILE: '角色名片',
|
|
||||||
SIDE_FILE: '角色侧视图',
|
|
||||||
STAND_FILE: '角色半身照',
|
|
||||||
CHARS_FILE: '角色头像',
|
|
||||||
GACHA_FILE: '角色立绘',
|
|
||||||
ICON_FILE: '图标',
|
|
||||||
REL_FILE: '圣遗物',
|
|
||||||
WEAPON_FILE: '武器',
|
|
||||||
GUIDE_FILE: '攻略',
|
|
||||||
REF_FILE: '参考面板',
|
|
||||||
}
|
|
||||||
|
|
||||||
async def _download(tasks: List[asyncio.Task]):
|
|
||||||
failed_list.extend(
|
|
||||||
list(filter(lambda x: x is not None, await asyncio.gather(*tasks)))
|
|
||||||
)
|
)
|
||||||
tasks.clear()
|
|
||||||
logger.info(f'{BASE_TAG}下载完成!')
|
|
||||||
|
|
||||||
failed_list: List[Tuple[str, int, str]] = []
|
|
||||||
TASKS = []
|
|
||||||
async with ClientSession(
|
|
||||||
connector=TCPConnector(verify_ssl=False),
|
|
||||||
timeout=ClientTimeout(total=None, sock_connect=20, sock_read=200),
|
|
||||||
) as sess:
|
|
||||||
for file in [
|
|
||||||
NAMECARD_FILE,
|
|
||||||
SIDE_FILE,
|
|
||||||
STAND_FILE,
|
|
||||||
CHARS_FILE,
|
|
||||||
GACHA_FILE,
|
|
||||||
ICON_FILE,
|
|
||||||
REL_FILE,
|
|
||||||
WEAPON_FILE,
|
|
||||||
GUIDE_FILE,
|
|
||||||
REF_FILE,
|
|
||||||
]:
|
|
||||||
base_data = await _get_url(file, sess)
|
|
||||||
content_bs = BeautifulSoup(base_data, 'lxml')
|
|
||||||
pre_data = content_bs.find_all('pre')[0]
|
|
||||||
data_list = pre_data.find_all('a')
|
|
||||||
size_list = [i for i in content_bs.strings]
|
|
||||||
logger.info(
|
|
||||||
f'{BASE_TAG}数据库[{FILE_TO_NAME[file]}]中存在{len(data_list)}个内容!'
|
|
||||||
)
|
|
||||||
temp_num = 0
|
|
||||||
for index, data in enumerate(data_list):
|
|
||||||
if data['href'] == '../':
|
|
||||||
continue
|
|
||||||
url = f'{file}/{data["href"]}'
|
|
||||||
name = data.text
|
|
||||||
size = size_list[index * 2 + 6].split(' ')[-1]
|
|
||||||
size = size.replace('\r\n', '')
|
|
||||||
path = Path(PATH_MAP[FILE_TO_PATH[file]] / name)
|
|
||||||
if path.exists():
|
|
||||||
is_diff = size == str(os.stat(path).st_size)
|
|
||||||
else:
|
|
||||||
is_diff = True
|
|
||||||
if (
|
|
||||||
not path.exists()
|
|
||||||
or not os.stat(path).st_size
|
|
||||||
or not is_diff
|
|
||||||
):
|
|
||||||
logger.info(
|
|
||||||
f'{BASE_TAG}开始下载[{FILE_TO_NAME[file]}]_[{name}]...'
|
|
||||||
)
|
|
||||||
temp_num += 1
|
|
||||||
TASKS.append(
|
|
||||||
asyncio.wait_for(
|
|
||||||
download_file(url, FILE_TO_PATH[file], name, sess),
|
|
||||||
timeout=60,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
# await download_file(url, FILE_TO_PATH[file], name)
|
|
||||||
if len(TASKS) >= 10:
|
|
||||||
await _download(TASKS)
|
|
||||||
else:
|
|
||||||
await _download(TASKS)
|
|
||||||
if temp_num == 0:
|
|
||||||
im = f'{BASE_TAG}数据库[{FILE_TO_NAME[file]}]无需下载!'
|
|
||||||
else:
|
|
||||||
im = f'{BASE_TAG}数据库[{FILE_TO_NAME[file]}]已下载{temp_num}个内容!'
|
|
||||||
temp_num = 0
|
|
||||||
logger.info(im)
|
|
||||||
if failed_list:
|
|
||||||
logger.info(f'{BASE_TAG}开始重新下载失败的{len(failed_list)}个文件...')
|
|
||||||
for url, file, name in failed_list:
|
|
||||||
TASKS.append(
|
|
||||||
asyncio.wait_for(
|
|
||||||
download_file(url, file, name, sess),
|
|
||||||
timeout=60,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
if len(TASKS) >= 10:
|
|
||||||
await _download(TASKS)
|
|
||||||
else:
|
|
||||||
await _download(TASKS)
|
|
||||||
if count := len(failed_list):
|
|
||||||
logger.error(f'{BASE_TAG}仍有{count}个文件未下载，请使用命令 `下载全部资源` 重新下载')
|
|
||||||
|
|
||||||
for d_files in ['100000067.png', '100000068.png']:
|
for d_files in ['100000067.png', '100000068.png']:
|
||||||
path = CHAR_PATH / d_files
|
path = CHAR_PATH / d_files
|
||||||
if path.exists():
|
if path.exists():
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user