mirror of
https://github.com/baiqwerdvd/StarRailUID.git
synced 2025-05-05 19:23:45 +08:00
🚧完成抽卡链接获取抽卡记录
This commit is contained in:
qwerdvd
parent
f4b570c134
commit
41b2a549e2
@ -4,11 +4,12 @@ from gsuid_core.models import Event
|
|||||||
|
|
||||||
from ..utils.convert import get_uid
|
from ..utils.convert import get_uid
|
||||||
from ..utils.error_reply import UID_HINT
|
from ..utils.error_reply import UID_HINT
|
||||||
|
from .get_gachalogs import save_gachalogs
|
||||||
|
|
||||||
# from .get_gachalogs import save_gachalogs
|
|
||||||
# from .draw_gachalogs import draw_gachalogs_img
|
# from .draw_gachalogs import draw_gachalogs_img
|
||||||
|
|
||||||
sv_gacha_log = SV('sr抽卡记录')
|
sv_gacha_log = SV('sr抽卡记录')
|
||||||
|
sv_get_gachalog_by_link = SV('sr导入抽卡链接')
|
||||||
|
|
||||||
|
|
||||||
@sv_gacha_log.on_fullmatch(('sr抽卡记录'))
|
@sv_gacha_log.on_fullmatch(('sr抽卡记录'))
|
||||||
@ -20,3 +21,21 @@ async def send_gacha_log_card_info(bot: Bot, ev: Event):
|
|||||||
# im = await draw_gachalogs_img(uid, user_id)
|
# im = await draw_gachalogs_img(uid, user_id)
|
||||||
im = '画个饼先，在做了在做了'
|
im = '画个饼先，在做了在做了'
|
||||||
await bot.send(im)
|
await bot.send(im)
|
||||||
|
|
||||||
|
|
||||||
|
@sv_get_gachalog_by_link.on_command(('sr导入抽卡链接'))
|
||||||
|
async def get_gachalog_by_link(bot: Bot, ev: Event):
|
||||||
|
await bot.logger.info('开始执行[sr导入抽卡链接]')
|
||||||
|
uid = await get_uid(bot, ev, only_uid=True)
|
||||||
|
if uid is None:
|
||||||
|
return await bot.send(UID_HINT)
|
||||||
|
gacha_url = ev.text.strip()
|
||||||
|
if gacha_url and not isinstance(gacha_url, str):
|
||||||
|
return await bot.send('请给出正确的抽卡记录链接')
|
||||||
|
is_force = False
|
||||||
|
if ev.command.startswith('强制'):
|
||||||
|
await bot.logger.info('[WARNING]本次为强制刷新')
|
||||||
|
is_force = True
|
||||||
|
await bot.send(f'UID{uid}开始执行[刷新抽卡记录],需要一定时间...请勿重复触发！')
|
||||||
|
im = await save_gachalogs(uid, gacha_url, None, is_force)
|
||||||
|
return await bot.send(im)
|
||||||
|
|||||||
@ -1,145 +1,165 @@
|
|||||||
# import json
|
import json
|
||||||
# import asyncio
|
import asyncio
|
||||||
# from datetime import datetime
|
from urllib import parse
|
||||||
# from typing import Dict, Optional
|
from datetime import datetime
|
||||||
#
|
from typing import Dict, Optional
|
||||||
# from ..utils.mys_api import mys_api
|
|
||||||
# from ..utils.error_reply import SK_HINT
|
from ..utils.mys_api import mys_api
|
||||||
# from ..utils.resource.RESOURCE_PATH import PLAYER_PATH
|
from ..utils.error_reply import SK_HINT
|
||||||
#
|
from ..utils.resource.RESOURCE_PATH import PLAYER_PATH
|
||||||
# gacha_type_meta_data = {
|
|
||||||
# '新手祈愿': ['100'],
|
gacha_type_meta_data = {
|
||||||
# '常驻祈愿': ['200'],
|
'群星跃迁': ['1'],
|
||||||
# '角色祈愿': ['301', '400'],
|
'始发跃迁': ['2'],
|
||||||
# '武器祈愿': ['302'],
|
'角色跃迁': ['11'],
|
||||||
# }
|
'光锥跃迁': ['12'],
|
||||||
#
|
}
|
||||||
#
|
|
||||||
# async def get_new_gachalog(uid: str, full_data: Dict, is_force: bool):
|
|
||||||
# temp = []
|
async def get_new_gachalog_by_link(
|
||||||
# for gacha_name in gacha_type_meta_data:
|
gacha_url: str, full_data: Dict, is_force: bool
|
||||||
# for gacha_type in gacha_type_meta_data[gacha_name]:
|
):
|
||||||
# end_id = '0'
|
temp = []
|
||||||
# for page in range(1, 999):
|
for gacha_name in gacha_type_meta_data:
|
||||||
# data = await mys_api.get_gacha_log_by_authkey(
|
for gacha_type in gacha_type_meta_data[gacha_name]:
|
||||||
# uid, gacha_type, page, end_id
|
end_id = '0'
|
||||||
# )
|
for page in range(1, 999):
|
||||||
# await asyncio.sleep(0.9)
|
url = parse.urlparse(gacha_url)
|
||||||
# if isinstance(data, int):
|
url_parse = parse.parse_qs(url.query)
|
||||||
# return {}
|
authkey = url_parse['authkey'][0]
|
||||||
# data = data['list']
|
data = await mys_api.get_gacha_log_by_link_in_authkey(
|
||||||
# if data == []:
|
authkey, gacha_type, page, end_id
|
||||||
# break
|
)
|
||||||
# end_id = data[-1]['id']
|
await asyncio.sleep(0.9)
|
||||||
# if data[-1] in full_data[gacha_name] and not is_force:
|
if isinstance(data, int):
|
||||||
# for item in data:
|
return {}
|
||||||
# if item not in full_data[gacha_name]:
|
data = data['list']
|
||||||
# temp.append(item)
|
if data == []:
|
||||||
# full_data[gacha_name][0:0] = temp
|
break
|
||||||
# temp = []
|
end_id = data[-1]['id']
|
||||||
# break
|
if data[-1] in full_data[gacha_name] and not is_force:
|
||||||
# if len(full_data[gacha_name]) >= 1:
|
for item in data:
|
||||||
# if int(data[-1]['id']) <= int(
|
if item not in full_data[gacha_name]:
|
||||||
# full_data[gacha_name][0]['id']
|
temp.append(item)
|
||||||
# ):
|
full_data[gacha_name][0:0] = temp
|
||||||
# full_data[gacha_name].extend(data)
|
temp = []
|
||||||
# else:
|
break
|
||||||
# full_data[gacha_name][0:0] = data
|
if len(full_data[gacha_name]) >= 1:
|
||||||
# else:
|
if int(data[-1]['id']) <= int(
|
||||||
# full_data[gacha_name].extend(data)
|
full_data[gacha_name][0]['id']
|
||||||
# await asyncio.sleep(0.5)
|
):
|
||||||
# return full_data
|
full_data[gacha_name].extend(data)
|
||||||
#
|
else:
|
||||||
#
|
full_data[gacha_name][0:0] = data
|
||||||
# async def save_gachalogs(
|
else:
|
||||||
# uid: str, raw_data: Optional[dict] = None, is_force: bool = False
|
full_data[gacha_name].extend(data)
|
||||||
# ) -> str:
|
await asyncio.sleep(0.5)
|
||||||
# path = PLAYER_PATH / str(uid)
|
return full_data
|
||||||
# if not path.exists():
|
|
||||||
# path.mkdir(parents=True, exist_ok=True)
|
|
||||||
#
|
async def save_gachalogs(
|
||||||
# # 获取当前时间
|
uid: str,
|
||||||
# now = datetime.now()
|
gacha_url: str,
|
||||||
# current_time = now.strftime('%Y-%m-%d %H-%M-%S')
|
raw_data: Optional[dict] = None,
|
||||||
#
|
is_force: bool = False,
|
||||||
# # 初始化最后保存的数据
|
) -> str:
|
||||||
# result = {}
|
path = PLAYER_PATH / str(uid)
|
||||||
#
|
if not path.exists():
|
||||||
# # 抽卡记录json路径
|
path.mkdir(parents=True, exist_ok=True)
|
||||||
# gachalogs_path = path / 'gacha_logs.json'
|
|
||||||
#
|
# 获取当前时间
|
||||||
# # 如果有老的,准备合并, 先打开文件
|
now = datetime.now()
|
||||||
# gachalogs_history = {}
|
current_time = now.strftime('%Y-%m-%d %H-%M-%S')
|
||||||
# old_normal_gacha_num, old_char_gacha_num, old_weapon_gacha_num = 0, 0, 0
|
|
||||||
# if gachalogs_path.exists():
|
# 初始化最后保存的数据
|
||||||
# with open(gachalogs_path, "r", encoding='UTF-8') as f:
|
result = {}
|
||||||
# gachalogs_history: Dict = json.load(f)
|
|
||||||
# gachalogs_history = gachalogs_history['data']
|
# 抽卡记录json路径
|
||||||
# old_normal_gacha_num = len(gachalogs_history['常驻祈愿'])
|
gachalogs_path = path / 'gacha_logs.json'
|
||||||
# old_char_gacha_num = len(gachalogs_history['角色祈愿'])
|
|
||||||
# old_weapon_gacha_num = len(gachalogs_history['武器祈愿'])
|
# 如果有老的,准备合并, 先打开文件
|
||||||
# else:
|
gachalogs_history = {}
|
||||||
# gachalogs_history = {
|
(
|
||||||
# '新手祈愿': [],
|
old_normal_gacha_num,
|
||||||
# '常驻祈愿': [],
|
old_begin_gacha_num,
|
||||||
# '角色祈愿': [],
|
old_char_gacha_num,
|
||||||
# '武器祈愿': [],
|
old_weapon_gacha_num,
|
||||||
# }
|
) = (0, 0, 0, 0)
|
||||||
#
|
if gachalogs_path.exists():
|
||||||
# # 获取新抽卡记录
|
with open(gachalogs_path, "r", encoding='UTF-8') as f:
|
||||||
# if raw_data is None:
|
gachalogs_history: Dict = json.load(f)
|
||||||
# raw_data = await get_new_gachalog(uid, gachalogs_history, is_force)
|
gachalogs_history = gachalogs_history['data']
|
||||||
# else:
|
old_normal_gacha_num = len(gachalogs_history['群星跃迁'])
|
||||||
# new_data = {'新手祈愿': [], '常驻祈愿': [], '角色祈愿': [], '武器祈愿': []}
|
old_begin_gacha_num = len(gachalogs_history['始发跃迁'])
|
||||||
# if gachalogs_history:
|
old_char_gacha_num = len(gachalogs_history['角色跃迁'])
|
||||||
# for i in ['新手祈愿', '常驻祈愿', '角色祈愿', '武器祈愿']:
|
old_weapon_gacha_num = len(gachalogs_history['光锥跃迁'])
|
||||||
# for item in raw_data[i]:
|
else:
|
||||||
# if (
|
gachalogs_history = {
|
||||||
# item not in gachalogs_history[i]
|
'群星跃迁': [],
|
||||||
# and item not in new_data[i]
|
'始发跃迁': [],
|
||||||
# ):
|
'角色跃迁': [],
|
||||||
# new_data[i].append(item)
|
'光锥跃迁': [],
|
||||||
# raw_data = new_data
|
}
|
||||||
# for i in ['新手祈愿', '常驻祈愿', '角色祈愿', '武器祈愿']:
|
|
||||||
# raw_data[i].extend(gachalogs_history[i])
|
# 获取新抽卡记录
|
||||||
#
|
if raw_data is None:
|
||||||
# if raw_data == {} or not raw_data:
|
raw_data = await get_new_gachalog_by_link(
|
||||||
# return SK_HINT
|
gacha_url, gachalogs_history, is_force
|
||||||
#
|
)
|
||||||
# temp_data = {'新手祈愿': [], '常驻祈愿': [], '角色祈愿': [], '武器祈愿': []}
|
else:
|
||||||
# for i in ['新手祈愿', '常驻祈愿', '角色祈愿', '武器祈愿']:
|
new_data = {'始发跃迁': [], '群星跃迁': [], '角色跃迁': [], '光锥跃迁': []}
|
||||||
# for item in raw_data[i]:
|
if gachalogs_history:
|
||||||
# if item not in temp_data[i]:
|
for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']:
|
||||||
# temp_data[i].append(item)
|
for item in raw_data[i]:
|
||||||
# raw_data = temp_data
|
if (
|
||||||
#
|
item not in gachalogs_history[i]
|
||||||
# result['uid'] = uid
|
and item not in new_data[i]
|
||||||
# result['data_time'] = current_time
|
):
|
||||||
# result['normal_gacha_num'] = len(raw_data['常驻祈愿'])
|
new_data[i].append(item)
|
||||||
# result['char_gacha_num'] = len(raw_data['角色祈愿'])
|
raw_data = new_data
|
||||||
# result['weapon_gacha_num'] = len(raw_data['武器祈愿'])
|
for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']:
|
||||||
# for i in ['常驻祈愿', '角色祈愿', '武器祈愿']:
|
raw_data[i].extend(gachalogs_history[i])
|
||||||
# if len(raw_data[i]) > 1:
|
|
||||||
# raw_data[i].sort(key=lambda x: (-int(x['id'])))
|
if raw_data == {} or not raw_data:
|
||||||
# result['data'] = raw_data
|
return SK_HINT
|
||||||
#
|
|
||||||
# # 计算数据
|
temp_data = {'始发跃迁': [], '群星跃迁': [], '角色跃迁': [], '光锥跃迁': []}
|
||||||
# normal_add = result['normal_gacha_num'] - old_normal_gacha_num
|
for i in ['始发跃迁', '群星跃迁', '角色跃迁', '光锥跃迁']:
|
||||||
# char_add = result['char_gacha_num'] - old_char_gacha_num
|
for item in raw_data[i]:
|
||||||
# weapon_add = result['weapon_gacha_num'] - old_weapon_gacha_num
|
if item not in temp_data[i]:
|
||||||
# all_add = normal_add + char_add + weapon_add
|
temp_data[i].append(item)
|
||||||
#
|
raw_data = temp_data
|
||||||
# # 保存文件
|
|
||||||
# with open(gachalogs_path, 'w', encoding='UTF-8') as file:
|
result['uid'] = uid
|
||||||
# json.dump(result, file, ensure_ascii=False)
|
result['data_time'] = current_time
|
||||||
#
|
result['normal_gacha_num'] = len(raw_data['群星跃迁'])
|
||||||
# # 回复文字
|
result['begin_gacha_num'] = len(raw_data['始发跃迁'])
|
||||||
# if all_add == 0:
|
result['char_gacha_num'] = len(raw_data['角色跃迁'])
|
||||||
# im = f'UID{uid}没有新增祈愿数据!'
|
result['weapon_gacha_num'] = len(raw_data['光锥跃迁'])
|
||||||
# else:
|
for i in ['群星跃迁', '角色跃迁', '光锥跃迁']:
|
||||||
# im = (
|
if len(raw_data[i]) > 1:
|
||||||
# f'UID{uid}数据更新成功！'
|
raw_data[i].sort(key=lambda x: (-int(x['id'])))
|
||||||
# f'本次更新{all_add}个数据\n'
|
result['data'] = raw_data
|
||||||
# f'常驻祈愿{normal_add}个\n角色祈愿{char_add}个\n武器祈愿{weapon_add}个！'
|
|
||||||
# )
|
# 计算数据
|
||||||
# return im
|
normal_add = result['normal_gacha_num'] - old_normal_gacha_num
|
||||||
|
begin_gacha_add = result['begin_gacha_num'] - old_begin_gacha_num
|
||||||
|
char_add = result['char_gacha_num'] - old_char_gacha_num
|
||||||
|
weapon_add = result['weapon_gacha_num'] - old_weapon_gacha_num
|
||||||
|
all_add = normal_add + char_add + weapon_add + begin_gacha_add
|
||||||
|
|
||||||
|
# 保存文件
|
||||||
|
with open(gachalogs_path, 'w', encoding='UTF-8') as file:
|
||||||
|
json.dump(result, file, ensure_ascii=False)
|
||||||
|
|
||||||
|
# 回复文字
|
||||||
|
if all_add == 0:
|
||||||
|
im = f'UID{uid}没有新增祈愿数据!'
|
||||||
|
else:
|
||||||
|
im = (
|
||||||
|
f'UID{uid}数据更新成功！'
|
||||||
|
f'本次更新{all_add}个数据\n'
|
||||||
|
f'群星跃迁{normal_add}个\n始发跃迁{begin_gacha_add}\n'
|
||||||
|
f'角色跃迁{char_add}个\n光锥跃迁{weapon_add}个！'
|
||||||
|
)
|
||||||
|
return im
|
||||||
|
|||||||
@ -11,19 +11,21 @@ from .error_reply import VERIFY_HINT
|
|||||||
|
|
||||||
|
|
||||||
@overload
|
@overload
|
||||||
async def get_uid(bot: Bot, ev: Event) -> Optional[str]:
|
async def get_uid(
|
||||||
|
bot: Bot, ev: Event, only_uid: bool = False
|
||||||
|
) -> Optional[str]:
|
||||||
...
|
...
|
||||||
|
|
||||||
|
|
||||||
@overload
|
@overload
|
||||||
async def get_uid(
|
async def get_uid(
|
||||||
bot: Bot, ev: Event, get_user_id: bool = True
|
bot: Bot, ev: Event, get_user_id: bool = True, only_uid: bool = False
|
||||||
) -> Tuple[Optional[str], str]:
|
) -> Tuple[Optional[str], str]:
|
||||||
...
|
...
|
||||||
|
|
||||||
|
|
||||||
async def get_uid(
|
async def get_uid(
|
||||||
bot: Bot, ev: Event, get_user_id: bool = False
|
bot: Bot, ev: Event, get_user_id: bool = False, only_uid: bool = False
|
||||||
) -> Union[Optional[str], Tuple[Optional[str], str]]:
|
) -> Union[Optional[str], Tuple[Optional[str], str]]:
|
||||||
uid_data = re.findall(r'\d{9}', ev.text)
|
uid_data = re.findall(r'\d{9}', ev.text)
|
||||||
user_id = ev.at if ev.at else ev.user_id
|
user_id = ev.at if ev.at else ev.user_id
|
||||||
@ -34,6 +36,9 @@ async def get_uid(
|
|||||||
else:
|
else:
|
||||||
sqla = get_sqla(ev.bot_id)
|
sqla = get_sqla(ev.bot_id)
|
||||||
sr_uid = await sqla.get_bind_sruid(user_id)
|
sr_uid = await sqla.get_bind_sruid(user_id)
|
||||||
|
if only_uid:
|
||||||
|
sqla = get_sqla(ev.bot_id)
|
||||||
|
sr_uid = await sqla.get_bind_sruid(user_id)
|
||||||
if get_user_id:
|
if get_user_id:
|
||||||
return sr_uid, user_id
|
return sr_uid, user_id
|
||||||
return sr_uid
|
return sr_uid
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user