From f05d4ec9317df70a7e659267ad8ff473738c0a64 Mon Sep 17 00:00:00 2001 From: dingshan Date: Fri, 5 Aug 2022 15:35:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=9B=E9=A9=AC?= =?UTF-8?q?=E5=A8=98=E9=87=8D=E8=BD=BD=E5=8D=A1=E6=B1=A0=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/draw_card/handles/base_handle.py | 1 + plugins/draw_card/handles/pretty_handle.py | 25 ++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/plugins/draw_card/handles/base_handle.py b/plugins/draw_card/handles/base_handle.py index 9e019884..526be07a 100644 --- a/plugins/draw_card/handles/base_handle.py +++ b/plugins/draw_card/handles/base_handle.py @@ -50,6 +50,7 @@ class UpEvent(BaseModel): start_time: Optional[datetime] # 开始时间 end_time: Optional[datetime] # 结束时间 up_char: List[UpChar] # up对象 + up_name: str = "" TC = TypeVar("TC", bound="BaseData") diff --git a/plugins/draw_card/handles/pretty_handle.py b/plugins/draw_card/handles/pretty_handle.py index da56bd64..f4147d5d 100644 --- a/plugins/draw_card/handles/pretty_handle.py +++ b/plugins/draw_card/handles/pretty_handle.py @@ -350,48 +350,52 @@ class PrettyHandle(BaseHandle[PrettyData]): char_img = "" card_img = "" up_chars = [] + up_chars_name = [] up_cards = [] + up_cards_name = [] soup = BeautifulSoup(result, "lxml") heads = soup.find_all("span", {"class": "mw-headline"}) for head in heads: - if "时间" in head.text: + if "时间" in head.text or "期间" in head.text: time = head.find_next("p").text.split("\n")[0] if "～" in time: start, end = time.split("～") start_time = dateparser.parse(start) end_time = dateparser.parse(end) elif "赛马娘" in head.text: - char_img = head.find_next("a", {"class": "image"}).find("img")[ + char_img = head.find_next("center").find("img")[ "src" ] lines = str(head.find_next("p").text).split("\n") chars = [ line for line in lines - if "★" in line and "（" in line and "）" in line + if "★" in line and "【" in line and "】" in line ] for char in chars: star = char.count("★") - name = re.split(r"[（）]", char)[-2].strip() + name = re.split(r"[【】]", char)[-2].strip() up_chars.append( UpChar(name=name, star=star, limited=False, zoom=70) ) + up_chars_name.append(name) elif "支援卡" in head.text: - card_img = head.find_next("a", {"class": "image"}).find("img")[ + card_img = head.find_next("center").find("img")[ "src" ] lines = str(head.find_next("p").text).split("\n") cards = [ line for line in lines - if "R" in line and "（" in line and "）" in line + if "R" in line and "【" in line and "】" in line ] for card in cards: star = 3 if "SSR" in card else 2 if "SR" in card else 1 - name = re.split(r"[（）]", card)[-2].strip() + name = re.split(r"[【】]", card)[-2].strip() up_cards.append( UpChar(name=name, star=star, limited=False, zoom=70) ) + up_cards_name.append(name) if start_time and end_time: if start_time <= datetime.now() <= end_time: self.UP_CHAR = UpEvent( @@ -400,6 +404,7 @@ class PrettyHandle(BaseHandle[PrettyData]): start_time=start_time, end_time=end_time, up_char=up_chars, + up_name=up_chars_name, ) self.UP_CARD = UpEvent( title=title, @@ -407,6 +412,7 @@ class PrettyHandle(BaseHandle[PrettyData]): start_time=start_time, end_time=end_time, up_char=up_cards, + up_name=up_cards_name, ) self.dump_up_char() logger.info(f"成功获取{self.game_name_cn}当前up信息...当前up池: {title}") @@ -418,9 +424,10 @@ class PrettyHandle(BaseHandle[PrettyData]): self.load_up_char() if self.UP_CHAR and self.UP_CARD: return Message( - Message.template("重载成功！\n当前UP池子：{}{:image}{:image}").format( - self.UP_CHAR.title, + Message.template("重载成功！\n当前UP池子：{}{:image}\n当前支援卡池子：{}{:image}").format( + self.UP_CHAR.up_name, self.UP_CHAR.pool_img, + self.UP_CARD.up_name, self.UP_CARD.pool_img, ) ) From 6151dfb1619e70550b15ddd7efbf48aa3c0b8083 Mon Sep 17 00:00:00 2001 From: dingshan Date: Fri, 5 Aug 2022 15:42:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=9B=E9=A9=AC?= =?UTF-8?q?=E5=A8=98=E9=87=8D=E8=BD=BD=E5=8D=A1=E6=B1=A0=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/draw_card/handles/base_handle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/draw_card/handles/base_handle.py b/plugins/draw_card/handles/base_handle.py index 526be07a..ddfc59af 100644 --- a/plugins/draw_card/handles/base_handle.py +++ b/plugins/draw_card/handles/base_handle.py @@ -50,7 +50,7 @@ class UpEvent(BaseModel): start_time: Optional[datetime] # 开始时间 end_time: Optional[datetime] # 结束时间 up_char: List[UpChar] # up对象 - up_name: str = "" + up_name: str = "" # up名称 TC = TypeVar("TC", bound="BaseData") From 3c120ce6020282e437bf78bf3d2e4c199d029bb4 Mon Sep 17 00:00:00 2001 From: dingshan Date: Fri, 5 Aug 2022 15:49:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/draw_card/handles/pretty_handle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/draw_card/handles/pretty_handle.py b/plugins/draw_card/handles/pretty_handle.py index f4147d5d..4011e416 100644 --- a/plugins/draw_card/handles/pretty_handle.py +++ b/plugins/draw_card/handles/pretty_handle.py @@ -372,7 +372,7 @@ class PrettyHandle(BaseHandle[PrettyData]): for line in lines if "★" in line and "【" in line and "】" in line ] - for char in chars: + for char in set(chars): # list去重 star = char.count("★") name = re.split(r"[【】]", char)[-2].strip() up_chars.append(