From d0180833ab85517f56af71788aa2e26d4e509dc3 Mon Sep 17 00:00:00 2001 From: qwerdvd <2450899274@qq.com> Date: Sat, 29 Apr 2023 20:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84print?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- StarRailUID/starrailuid_resin/__init__.py | 1 - .../starrailuid_resin/draw_resin_card.py | 53 +++++++++---------- StarRailUID/utils/mys_api.py | 5 -- 3 files changed, 26 insertions(+), 33 deletions(-) diff --git a/StarRailUID/starrailuid_resin/__init__.py b/StarRailUID/starrailuid_resin/__init__.py index 78f3c16..80c6309 100644 --- a/StarRailUID/starrailuid_resin/__init__.py +++ b/StarRailUID/starrailuid_resin/__init__.py @@ -26,7 +26,6 @@ sv_get_resin_admin = SV('sr强制推送', pm=1) async def send_daily_info(bot: Bot, ev: Event): await bot.logger.info('开始执行[sr每日信息文字版]') uid = await get_uid(bot, ev) - print(uid) if uid is None: return await bot.send(UID_HINT) await bot.logger.info('[sr每日信息文字版]UID: {}'.format(uid)) diff --git a/StarRailUID/starrailuid_resin/draw_resin_card.py b/StarRailUID/starrailuid_resin/draw_resin_card.py index 8868d24..bcdc785 100644 --- a/StarRailUID/starrailuid_resin/draw_resin_card.py +++ b/StarRailUID/starrailuid_resin/draw_resin_card.py @@ -87,32 +87,32 @@ async def _draw_task_img( async def get_resin_img(bot_id: str, user_id: str): - # try: - sqla = get_sqla(bot_id) - uid_list: List = await sqla.get_bind_sruid_list(user_id) - logger.info('[每日信息]UID: {}'.format(uid_list)) - # 进行校验UID是否绑定CK - useable_uid_list = [] - for uid in uid_list: - status = await sqla.get_user_cookie(uid) - if status is not None: - useable_uid_list.append(uid) - logger.info('[每日信息]可用UID: {}'.format(useable_uid_list)) - if len(useable_uid_list) == 0: - return '请先绑定一个可用CK & UID再来查询哦~' - # 开始绘图任务 - task = [] - img = Image.new( - 'RGBA', (based_w * len(useable_uid_list), based_h), (0, 0, 0, 0) - ) - for uid_index, uid in enumerate(useable_uid_list): - task.append(_draw_all_resin_img(img, uid, uid_index)) - await asyncio.gather(*task) - res = await convert_img(img) - logger.info('[查询每日信息]绘图已完成,等待发送!') - # except TypeError: - # logger.exception('[查询每日信息]绘图失败!') - # res = '你绑定过的UID中可能存在过期CK~请重新绑定一下噢~' + try: + sqla = get_sqla(bot_id) + uid_list: List = await sqla.get_bind_sruid_list(user_id) + logger.info('[每日信息]UID: {}'.format(uid_list)) + # 进行校验UID是否绑定CK + useable_uid_list = [] + for uid in uid_list: + status = await sqla.get_user_cookie(uid) + if status is not None: + useable_uid_list.append(uid) + logger.info('[每日信息]可用UID: {}'.format(useable_uid_list)) + if len(useable_uid_list) == 0: + return '请先绑定一个可用CK & UID再来查询哦~' + # 开始绘图任务 + task = [] + img = Image.new( + 'RGBA', (based_w * len(useable_uid_list), based_h), (0, 0, 0, 0) + ) + for uid_index, uid in enumerate(useable_uid_list): + task.append(_draw_all_resin_img(img, uid, uid_index)) + await asyncio.gather(*task) + res = await convert_img(img) + logger.info('[查询每日信息]绘图已完成,等待发送!') + except TypeError: + logger.exception('[查询每日信息]绘图失败!') + res = '你绑定过的UID中可能存在过期CK~请重新绑定一下噢~' return res @@ -177,7 +177,6 @@ async def draw_resin_img(sr_uid: str) -> Image.Image: # 派遣 task_task = [] for index, char in enumerate(daily_data['expeditions']): - print(f'index: {index}, char: {char}') task_task.append(_draw_task_img(img, img_draw, index, char)) await asyncio.gather(*task_task) diff --git a/StarRailUID/utils/mys_api.py b/StarRailUID/utils/mys_api.py index 8a286ef..2d3e561 100644 --- a/StarRailUID/utils/mys_api.py +++ b/StarRailUID/utils/mys_api.py @@ -109,7 +109,6 @@ class _MysApi(BaseMysApi): async def get_daily_data(self, uid: str) -> Union[DailyNoteData, int]: data = await self.simple_mys_req('STAR_RAIL_NOTE_URL', uid) - print(data) if isinstance(data, Dict): data = cast(DailyNoteData, data['data']) return data @@ -235,7 +234,6 @@ class _MysApi(BaseMysApi): data = await self.simple_mys_req( 'STAR_RAIL_ROLE_BASIC_INFO_URL', sr_uid ) - print(data) if isinstance(data, Dict): data = cast(DailyNoteData, data['data']) return data @@ -253,7 +251,6 @@ class _MysApi(BaseMysApi): use_proxy = True else: _URL = _API[url] - print(_URL) HEADER = copy.deepcopy(self._HEADER) use_proxy = False if header: @@ -288,7 +285,6 @@ class _MysApi(BaseMysApi): server_id = RECOGNIZE_SERVER.get(uid[0]) is_os = False if int(uid[0]) < 6 else True ex_params = '&'.join([f'{k}={v}' for k, v in params.items()]) - print(server_id, is_os, ex_params) if is_os: _URL = _API[f'{URL}_OS'] HEADER = copy.deepcopy(self._HEADER_OS) @@ -300,7 +296,6 @@ class _MysApi(BaseMysApi): ex_params if ex_params else f'role_id={uid}&server={server_id}' ) HEADER.update(header) - print(_URL) if cookie is not None: HEADER['Cookie'] = cookie elif 'Cookie' not in HEADER and isinstance(uid, str):