diff --git a/nonebot_plugin_marshoai/tools/marshoai-meogirl/mg_Search.py b/nonebot_plugin_marshoai/tools/marshoai-meogirl/mg_Search.py index 27f6f637..2e54522d 100644 --- a/nonebot_plugin_marshoai/tools/marshoai-meogirl/mg_Search.py +++ b/nonebot_plugin_marshoai/tools/marshoai-meogirl/mg_Search.py @@ -2,24 +2,34 @@ from nonebot.log import logger import re import httpx +import urllib.parse from bs4 import BeautifulSoup +from watchfiles import awatch + + +async def get_async_data (url): + async with httpx.AsyncClient() as client: + return await client.get(url) async def search(msg : str, num : int): logger.info(f"搜索 : \"{msg}\"") result = "" - headers = { - 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36' - } - url = "https://mzh.moegirl.org.cn/index.php?search=" + msg - async with httpx.AsyncClient() as client: - response = await client.get(url, headers = headers) - logger.info(response.headers.get('Location')) - logger.info(f"连接萌娘百科中, 状态码 : {response.status_code}") + # headers = { + # 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36' + # } + url = "https://mzh.moegirl.org.cn/index.php?search=" + urllib.parse.quote_plus(msg) + # client = httpx.AsyncClient() + # async with client: + # response = await client.post(url, headers = headers) + response = await get_async_data(url) + logger.info(f"连接\"{response.headers.get('location')}\"中, 状态码 : {response.status_code}") + # 正常搜索 + if response.status_code == 200: """ 萌娘百科搜索页面结构 - div.searchresults # 若无, 证明页面已重定向 + div.searchresults └── p ... └── ul.mw-search-results # 若无, 证明无搜索结果 └── li # 一个搜索结果 @@ -29,68 +39,70 @@ async def search(msg : str, num : int): └── li ... └── li ... """ - if response.status_code == 200: - soup = BeautifulSoup(response.text, 'html.parser') + soup = BeautifulSoup(response.text, 'html.parser') - # 检测div.searchresults, 是否已重定向 - if soup.find('div', class_='searchresults'): - # 检测ul.mw-search-results, 是否有结果 - if soup.find('ul', class_='mw-search-results'): - ul_tag = soup.select('ul.mw-search-results')[0] - li_tags = ul_tag.select('li') - for li_tag in li_tags: + # 检测ul.mw-search-results, 是否有结果 + if soup.find('ul', class_='mw-search-results'): + ul_tag = soup.select('ul.mw-search-results')[0] + li_tags = ul_tag.select('li') + for li_tag in li_tags: - div_heading = li_tag.select('div.mw-search-result-heading')[0] - if div_heading: - a_tag = div_heading.select('a')[0] - result += a_tag['title'] + "\n" - logger.info(f"搜索到 : \"{a_tag['title']}\"") + div_heading = li_tag.select('div.mw-search-result-heading')[0] + if div_heading: + a_tag = div_heading.select('a')[0] + result += a_tag['title'] + "\n" + logger.info(f"搜索到 : \"{a_tag['title']}\"") - div_result = li_tag.find('div', class_='searchresult') - if div_result: - content = str(div_result).replace('