fix

plugins/weather/data_source.py

@@ -1,21 +1,99 @@
-import requests
+from services.log import logger
 from utils.message_builder import image
+from utils.user_agent import get_user_agent
+from configs.path_config import TXT_PATH
+from asyncio.exceptions import TimeoutError
+from typing import List
+from nonebot import Driver
+from pathlib import Path
+import aiohttp
+import ujson as json
+import nonebot
+
+driver: Driver = nonebot.get_driver()
+
+china_city = Path(TXT_PATH) / "china_city.json"
+
+try:
+    with open(china_city, "r", encoding="utf8") as f:
+        data = json.load(f)
+except FileNotFoundError:
+    data = {}
 
 
-async def get_weather_of_city(city) -> str:
-    url = "http://wthrcdn.etouch.cn/weather_mini?city=" + city
-    data_json = requests.get(url).json()
-    if "desc" in data_json:
-        if data_json["desc"] == "invilad-citykey":
-            return "你为啥不查火星的天气呢？小真寻只支持国内天气查询!!" + image("shengqi", "zhenxun")
-        elif data_json["desc"] == "OK":
-            w_type = data_json["data"]["forecast"][0]["type"]
-            w_max = data_json["data"]["forecast"][0]["high"][3:]
-            w_min = data_json["data"]["forecast"][0]["low"][3:]
-            fengli = data_json["data"]["forecast"][0]["fengli"][9:-3]
-            ganmao = data_json["data"]["ganmao"]
-            fengxiang = data_json["data"]["forecast"][0]["fengxiang"]
-            repass = f"{city}的天气是 {w_type} 天\n最高温度: {w_max}\n最低温度: {w_min}\n风力: {fengli} {fengxiang}\n{ganmao}"
-            return repass
+async def get_weather_of_city(city: str) -> str:
+    code = _check_exists_city(city)
+    if code == 999:
+        return "不要查一个省份的天气啊，很累人的！"
+    elif code == 998:
+        return "真寻只可以查询国内的天气喔..."
     else:
-        return "好像出错了？"
+        async with aiohttp.ClientSession(headers=get_user_agent()) as session:
+            async with session.get(
+                f"http://wthrcdn.etouch.cn/weather_mini?city={city}", timeout=5
+            ) as res:
+                data_json = json.loads(await res.text(encoding="utf8"))
+                if "desc" in data_json:
+                    if data_json["desc"] == "invilad-citykey":
+                        return "你为啥不查火星的天气呢？小真寻只支持国内天气查询!!" + image(
+                            "shengqi", "zhenxun"
+                        )
+                    elif data_json["desc"] == "OK":
+                        w_type = data_json["data"]["forecast"][0]["type"]
+                        w_max = data_json["data"]["forecast"][0]["high"][3:]
+                        w_min = data_json["data"]["forecast"][0]["low"][3:]
+                        fengli = data_json["data"]["forecast"][0]["fengli"][9:-3]
+                        ganmao = data_json["data"]["ganmao"]
+                        fengxiang = data_json["data"]["forecast"][0]["fengxiang"]
+                        repass = f"{city}的天气是 {w_type} 天\n最高温度: {w_max}\n最低温度: {w_min}\n风力: {fengli} {fengxiang}\n{ganmao}"
+                        return repass
+                else:
+                    return "好像出错了？"
+
+
+# 更新城市
+@driver.on_startup
+async def update_city():
+    global data
+    try:
+        async with aiohttp.ClientSession(headers=get_user_agent()) as session:
+            async with session.get(
+                "http://www.weather.com.cn/data/city3jdata/china.html", timeout=5
+            ) as res:
+                provinces_data = json.loads(await res.text(encoding="utf8"))
+            for province in provinces_data.keys():
+                data[provinces_data[province]] = []
+                async with session.get(
+                    f"http://www.weather.com.cn/data/city3jdata/provshi/{province}.html",
+                    timeout=5,
+                ) as res:
+                    city_data = json.loads(await res.text(encoding="utf8"))
+                    for city in city_data.keys():
+                        data[provinces_data[province]].append(city_data[city])
+        with open(china_city, "w", encoding="utf8") as f:
+            json.dump(data, f, indent=4, ensure_ascii=False)
+        logger.info("自动更新城市列表完成.....")
+    except TimeoutError:
+        logger.info("自动更新城市列表超时.....")
+
+
+# 城市是否存在或是否是省份
+def _check_exists_city(city: str) -> int:
+    city = city if city[-1] != "市" else city[:-1]
+    for province in data.keys():
+        # 查询省份了
+        if city == province and len(data[province]) != 1:
+            return 999
+        for city_ in data[province]:
+            if city_ == city:
+                return 200
+    return 998
+
+
+def get_city_list() -> List[str]:
+    global data
+    city_list = []
+    for p in data.keys():
+        for c in data[p]:
+            city_list.append(c)
+    return city_list