update v0.0.9.0

plugins/draw_card/announcement.py

@@ -35,7 +35,7 @@ def is_expired(data: dict):
         now = datetime.now().date()
     except ValueError:
         return False
-    return start_date <= now <= end_date
+    return not start_date <= now <= end_date
 
 
 # 检查写入
@@ -175,7 +175,7 @@ class GenshinAnnouncement:
                     data[itype]['time'] = data[itype]['time'][:-1]
                 if '版本更新后' in data[itype]['time']:
                     sp = data[itype]['time'].split('~')
-                    end_time = datetime.strptime(sp[1].strip(), "%Y/%m/%d %H:%M:%S")
+                    end_time = datetime.strptime(sp[1].strip(), "%Y/%m/%d %H:%M")
                     start_time = end_time - timedelta(days=20)
                     data[itype]['time'] = start_time.strftime('%Y/%m/%d') + ' ~ ' + end_time.strftime('%Y/%m/%d')
                 tmp = ''

plugins/draw_card/genshin_handle.py

@@ -2,9 +2,24 @@ import os
 from nonebot.adapters.cqhttp import MessageSegment, Message
 import random
 from .update_game_info import update_info
-from .util import generate_img, init_star_rst, BaseData, set_list, get_star, init_up_char
-from .config import GENSHIN_FIVE_P, GENSHIN_FOUR_P, GENSHIN_G_FIVE_P, GENSHIN_G_FOUR_P, GENSHIN_THREE_P, I72_ADD, \
-    DRAW_PATH, GENSHIN_FLAG
+from .util import (
+    generate_img,
+    init_star_rst,
+    BaseData,
+    set_list,
+    get_star,
+    init_up_char,
+)
+from .config import (
+    GENSHIN_FIVE_P,
+    GENSHIN_FOUR_P,
+    GENSHIN_G_FIVE_P,
+    GENSHIN_G_FOUR_P,
+    GENSHIN_THREE_P,
+    I72_ADD,
+    DRAW_PATH,
+    GENSHIN_FLAG,
+)
 from dataclasses import dataclass
 from .init_card_pool import init_game_pool
 from .announcement import GenshinAnnouncement
@@ -27,9 +42,9 @@ ALL_ARMS = []
 UP_CHAR = []
 UP_ARMS = []
 
-_CURRENT_CHAR_POOL_TITLE = ''
-_CURRENT_ARMS_POOL_TITLE = ''
-POOL_IMG = ''
+_CURRENT_CHAR_POOL_TITLE = ""
+_CURRENT_ARMS_POOL_TITLE = ""
+POOL_IMG = ""
 
 
 @dataclass
@@ -39,19 +54,25 @@ class GenshinChar(BaseData):
 
 async def genshin_draw(user_id: int, count: int, pool_name: str):
     #                   0      1      2
-    cnlist = ['★★★★★', '★★★★', '★★★']
-    char_list, five_list, five_index_list, char_dict, star_list = _format_card_information(count, user_id, pool_name)
-    temp = ''
-    title = ''
+    cnlist = ["★★★★★", "★★★★", "★★★"]
+    (
+        char_list,
+        five_list,
+        five_index_list,
+        char_dict,
+        star_list,
+    ) = _format_card_information(count, user_id, pool_name)
+    temp = ""
+    title = ""
     up_type = []
     up_list = []
-    if pool_name == 'char' and _CURRENT_CHAR_POOL_TITLE:
+    if pool_name == "char" and _CURRENT_CHAR_POOL_TITLE:
         up_type = UP_CHAR
         title = _CURRENT_CHAR_POOL_TITLE
-    elif pool_name == 'arms' and _CURRENT_ARMS_POOL_TITLE:
+    elif pool_name == "arms" and _CURRENT_ARMS_POOL_TITLE:
         up_type = UP_ARMS
         title = _CURRENT_ARMS_POOL_TITLE
-    tmp = ''
+    tmp = ""
     if up_type:
         for x in up_type:
             for operator in x.operators:
@@ -61,80 +82,118 @@ async def genshin_draw(user_id: int, count: int, pool_name: str):
             elif x.star == 4:
                 tmp += f'四星UP：{" ".join(x.operators)}'
     rst = init_star_rst(star_list, cnlist, five_list, five_index_list, up_list)
-    pool_info = f'当前up池：{title}\n{tmp}' if title else ''
+    pool_info = f"当前up池：{title}\n{tmp}" if title else ""
     if count > 90:
         char_list = set_list(char_list)
-    return pool_info + '\n' + MessageSegment.image(
-        "base64://" + await generate_img(char_list, 'genshin', star_list)) + '\n' + rst[:-1] + \
-           temp[:-1] + f'\n距离保底发还剩 {90 - genshin_count[user_id] if genshin_count.get(user_id) else "^"} 抽' \
-           + "\n【五星：0.6%，四星：5.1%\n第72抽开始五星概率每抽加0.585%】"
+    return (
+        pool_info
+        + "\n"
+        + MessageSegment.image(
+            "base64://" + await generate_img(char_list, "genshin", star_list)
+        )
+        + "\n"
+        + rst[:-1]
+        + temp[:-1]
+        + f'\n距离保底发还剩 {90 - genshin_count[user_id] if genshin_count.get(user_id) else "^"} 抽'
+        + "\n【五星：0.6%，四星：5.1%\n第72抽开始五星概率每抽加0.585%】"
+    )
 
 
 async def update_genshin_info():
     global ALL_CHAR, ALL_ARMS
-    url = 'https://wiki.biligame.com/ys/角色筛选'
-    data, code = await update_info(url, 'genshin')
+    url = "https://wiki.biligame.com/ys/角色筛选"
+    data, code = await update_info(url, "genshin")
     if code == 200:
-        ALL_CHAR = init_game_pool('genshin', data, GenshinChar)
-    url = 'https://wiki.biligame.com/ys/武器图鉴'
-    data, code = await update_info(url, 'genshin_arms', ['头像', '名称', '类型', '稀有度.alt',
-                                                         '获取途径', '初始基础属性1', '初始基础属性2',
-                                                         '攻击力（MAX）', '副属性（MAX）', '技能'])
+        ALL_CHAR = init_game_pool("genshin", data, GenshinChar)
+    url = "https://wiki.biligame.com/ys/武器图鉴"
+    data, code = await update_info(
+        url,
+        "genshin_arms",
+        [
+            "头像",
+            "名称",
+            "类型",
+            "稀有度.alt",
+            "获取途径",
+            "初始基础属性1",
+            "初始基础属性2",
+            "攻击力（MAX）",
+            "副属性（MAX）",
+            "技能",
+        ],
+    )
     if code == 200:
-        ALL_ARMS = init_game_pool('genshin_arms', data, GenshinChar)
+        ALL_ARMS = init_game_pool("genshin_arms", data, GenshinChar)
     await _genshin_init_up_char()
 
 
 async def init_genshin_data():
     global ALL_CHAR, ALL_ARMS
     if GENSHIN_FLAG:
-        if not os.path.exists(DRAW_PATH + 'genshin.json') or not os.path.exists(DRAW_PATH + 'genshin_arms.json'):
+        if not os.path.exists(DRAW_PATH + "genshin.json") or not os.path.exists(
+            DRAW_PATH + "genshin_arms.json"
+        ):
             await update_genshin_info()
         else:
-            with open(DRAW_PATH + 'genshin.json', 'r', encoding='utf8') as f:
+            with open(DRAW_PATH + "genshin.json", "r", encoding="utf8") as f:
                 genshin_dict = json.load(f)
-            with open(DRAW_PATH + 'genshin_arms.json', 'r', encoding='utf8') as f:
+            with open(DRAW_PATH + "genshin_arms.json", "r", encoding="utf8") as f:
                 genshin_ARMS_dict = json.load(f)
-            ALL_CHAR = init_game_pool('genshin', genshin_dict, GenshinChar)
-            ALL_ARMS = init_game_pool('genshin_arms', genshin_ARMS_dict, GenshinChar)
+            ALL_CHAR = init_game_pool("genshin", genshin_dict, GenshinChar)
+            ALL_ARMS = init_game_pool("genshin_arms", genshin_ARMS_dict, GenshinChar)
         await _genshin_init_up_char()
 
 
 # 抽取卡池
-def _get_genshin_card(mode: int = 1, pool_name: str = '', add: float = 0.0):
+def _get_genshin_card(mode: int = 1, pool_name: str = "", add: float = 0.0):
     global ALL_ARMS, ALL_CHAR, UP_ARMS, UP_CHAR, _CURRENT_ARMS_POOL_TITLE, _CURRENT_CHAR_POOL_TITLE
     if mode == 1:
-        star = get_star([5, 4, 3], [GENSHIN_FIVE_P + add, GENSHIN_FOUR_P, GENSHIN_THREE_P])
+        star = get_star(
+            [5, 4, 3], [GENSHIN_FIVE_P + add, GENSHIN_FOUR_P, GENSHIN_THREE_P]
+        )
     elif mode == 2:
         star = get_star([5, 4], [GENSHIN_G_FIVE_P + add, GENSHIN_G_FOUR_P])
     else:
         star = 5
-    if pool_name == 'char':
+    if pool_name == "char":
         data_lst = UP_CHAR
         flag = _CURRENT_CHAR_POOL_TITLE
-        itype_all_lst = ALL_CHAR + [x for x in ALL_ARMS if x.star == star and x.star < 5]
-    elif pool_name == 'arms':
+        itype_all_lst = ALL_CHAR + [
+            x for x in ALL_ARMS if x.star == star and x.star < 5
+        ]
+    elif pool_name == "arms":
         data_lst = UP_ARMS
         flag = _CURRENT_ARMS_POOL_TITLE
-        itype_all_lst = ALL_ARMS + [x for x in ALL_CHAR if x.star == star and x.star < 5]
+        itype_all_lst = ALL_ARMS + [
+            x for x in ALL_CHAR if x.star == star and x.star < 5
+        ]
     else:
-        data_lst = ''
-        flag = ''
-        itype_all_lst = ''
+        data_lst = ""
+        flag = ""
+        itype_all_lst = ""
     all_lst = ALL_ARMS + ALL_CHAR
     # 是否UP
-    if flag and star > 3 and pool_name:
-        # 获取up角色列表
-        up_char_lst = [x.operators for x in data_lst if x.star == star][0]
-        # 成功获取up角色
-        if random.random() < 0.5:
-            up_char_name = random.choice(up_char_lst)
-            acquire_char = [x for x in all_lst if x.name == up_char_name][0]
+    try:
+        if flag and star > 3 and pool_name:
+            # 获取up角色列表
+            up_char_lst = [x.operators for x in data_lst if x.star == star][0]
+            print(up_char_lst)
+            # 成功获取up角色
+            if random.random() < 0.5:
+                up_char_name = random.choice(up_char_lst)
+                acquire_char = [x for x in all_lst if x.name == up_char_name][0]
+            else:
+                # 无up
+                all_char_lst = [
+                    x
+                    for x in itype_all_lst
+                    if x.star == star and x.name not in up_char_lst and not x.limited
+                ]
+                acquire_char = random.choice(all_char_lst)
         else:
-            # 无up
-            all_char_lst = [x for x in itype_all_lst if x.star == star and x.name not in up_char_lst and not x.limited]
-            acquire_char = random.choice(all_char_lst)
-    else:
+            chars = [x for x in all_lst if x.star == star and not x.limited]
+            acquire_char = random.choice(chars)
+    except IndexError:
         chars = [x for x in all_lst if x.star == star and not x.limited]
         acquire_char = random.choice(chars)
     return acquire_char, 5 - star
@@ -146,8 +205,8 @@ def _format_card_information(_count: int, user_id, pool_name):
     five_index_list = []
     five_list = []
     five_dict = {}
-    _start_add_count = 72 if pool_name == 'char' else 62
-    _x = 90 if pool_name == 'char' else 80      # 保底
+    _start_add_count = 72 if pool_name == "char" else 62
+    _x = 90 if pool_name == "char" else 80  # 保底
     add = 0.0
     if genshin_count.get(user_id) and _count <= _x:
         f_count = genshin_count[user_id]
@@ -202,9 +261,17 @@ def reset_count(user_id: int):
 # 获取up和概率
 async def _genshin_init_up_char():
     global _CURRENT_CHAR_POOL_TITLE, _CURRENT_ARMS_POOL_TITLE, UP_CHAR, UP_ARMS, POOL_IMG
-    _CURRENT_CHAR_POOL_TITLE, _CURRENT_ARMS_POOL_TITLE, POOL_IMG, UP_CHAR, UP_ARMS = await init_up_char(announcement)
+    (
+        _CURRENT_CHAR_POOL_TITLE,
+        _CURRENT_ARMS_POOL_TITLE,
+        POOL_IMG,
+        UP_CHAR,
+        UP_ARMS,
+    ) = await init_up_char(announcement)
 
 
 async def reload_genshin_pool():
     await _genshin_init_up_char()
-    return Message(f'当前UP池子：{_CURRENT_CHAR_POOL_TITLE} & {_CURRENT_ARMS_POOL_TITLE} {POOL_IMG}')
+    return Message(
+        f"当前UP池子：{_CURRENT_CHAR_POOL_TITLE} & {_CURRENT_ARMS_POOL_TITLE} {POOL_IMG}"
+    )

plugins/draw_card/update_game_info.py

@@ -182,7 +182,7 @@ def intermediate_check(member_dict: dict, key: str, game_name: str, td: bs4.elem
     if game_name == 'prts':
         if key == '获取途径':
             msg = re.search('<td.*?>([\\s\\S]*)</td>', str(td)).group(1).strip()
-            msg = msg[:-1] if msg[-1] == '\n' else msg
+            msg = msg[:-1] if msg and msg[-1] == '\n' else msg
             if msg.find('<a') != -1:
                 for a in td.find_all('a'):
                     msg = msg.replace(str(a), a.text)