Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update data_source.py

Browse Source
This commit is contained in:
HibiKier 2021-10-04 22:58:11 +08:00 committed by GitHub
parent e7eea2a7d9
commit 49c47c01a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/yiqing/data_source.py
View File

@ -1,6 +1,5 @@
from utils.user_agent import get_user_agent from utils.user_agent import get_user_agent
from configs.path_config import TEXT_PATH from configs.path_config import TEXT_PATH
from configs.config import NICKNAME
from typing import List from typing import List
from pathlib import Path from pathlib import Path
import ujson as json import ujson as json
@ -22,7 +21,7 @@ async def get_yiqing_data(area: str):
if area == "中国": if area == "中国":
province = area province = area
province_type = "" province_type = ""
elif area in data.keys() and area[-1] != "市": elif area[-1] == '省' or (area in data.keys() and area[-1] != "市"):
province = area if area[-1] != "省" else area[:-1] province = area if area[-1] != "省" else area[:-1]
if len(data[province]) == 1: if len(data[province]) == 1:
province_type = "市" province_type = "市"
@ -33,8 +32,6 @@ async def get_yiqing_data(area: str):
if area in data[p]: if area in data[p]:
province = p province = p
city = area city = area
if not province and not city:
return f"{NICKNAME}只支持国内的疫情查询喔..."
async with aiohttp.ClientSession(headers=get_user_agent()) as session: async with aiohttp.ClientSession(headers=get_user_agent()) as session:
async with session.get(url, timeout=7) as response: async with session.get(url, timeout=7) as response:
epidemic_data = json.loads((await response.json())["data"]) epidemic_data = json.loads((await response.json())["data"])
@ -77,7 +74,7 @@ async def get_yiqing_data(area: str):
) )
def get_city_list() -> List[str]: def get_city_and_province_list() -> List[str]:
global data global data
if not data: if not data:
try: try: