From 8d3bb91ed3641851952b9895644e695064b0a48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E5=85=89-k?=
 <36470587+kxgx@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:10:45 +0800
Subject: [PATCH] Update weather.py

---
 bin/weather.py | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/bin/weather.py b/bin/weather.py
index 7cadd6f..a082de6 100644
--- a/bin/weather.py
+++ b/bin/weather.py
@@ -1,21 +1,16 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
-import os, sys, re, json, time, datetime
-import logging
-import subprocess
 import os
-from threading import Timer
+import json
+import time
+import logging
 import requests
+from threading import Timer
 
 white = 255  # 颜色
 black = 0
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(message)s')  # 设置日志级别
 
-picdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'pic')
-libdir = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'lib')
-if os.path.exists(libdir):
-    sys.path.append(libdir)  # 将引入文件添加到环境变量
-
 def get_area_id(city_name):
     """从city.js中检索AREAID，无限重试直到成功"""
     url = "https://j.i8tq.com/weather2020/search/city.js"
@@ -23,20 +18,15 @@ def get_area_id(city_name):
         try:
             response = requests.get(url)
             response.raise_for_status()  # 检查请求是否成功
-            # 直接打印原始数据
-            logging.debug("Raw data from city.js: %s", response.text)
-            # 预处理返回的数据，去除非JSON部分
-            city_data_text = response.text.strip()
-            city_data_text = city_data_text.split('var city_data = ')[-1].rstrip(';')
+            city_data_text = response.text.strip().split('var city_data = ')[-1].rstrip(';')
             if city_data_text:
                 city_data = json.loads(city_data_text)
-                # 遍历数据结构，查找城市名称
                 for province, cities in city_data.items():
                     for city, districts in cities.items():
                         for district, info in districts.items():
                             if info['NAMECN'] == city_name:
                                 return info['AREAID']
-                logging.error("城市名称 '%s' 在城市数据中未找到，将使用默认城市信息", city_name)
+                logging.error("城市名称 '%s' 在城市数据中未找到", city_name)
             else:
                 logging.error("从city.js接收到的数据为空")
         except (requests.RequestException, json.JSONDecodeError) as e:
@@ -58,7 +48,6 @@ def get_current_city():
         except (requests.RequestException, json.JSONDecodeError) as e:
             logging.error("检索或解析当前城市时出现错误: %s", e)
             time.sleep(180)  # 重试前等待
-# 注意：无限重试可能会在特定情况下导致程序无法终止，请确保在实际使用中考虑适当的退出条件或限制重试次数。
 
 def schedule_getWeath():
     """调度 getWeath 函数每3分钟执行一次"""
@@ -76,13 +65,12 @@ def getWeath(city='101060101'):
         if area_id:
             city = area_id
     try:
-        response = requests.get('https://d1.weather.com.cn/sk_2d/'+city+'.html',headers=headers)
+        response = requests.get(f'https://d1.weather.com.cn/sk_2d/{city}.html', headers=headers)
         response.raise_for_status()  # 检查请求是否成功
         response.encoding = 'utf-8'
-        Weath = response.text[11:]
-        fileHandle = open('/root/2.13-Ink-screen-clock/bin/weather.json', 'w')
-        fileHandle.write(str(Weath))
-        fileHandle.close()
+        weather_data = response.text[11:]
+        with open('/root/2.13-Ink-screen-clock/bin/weather.json', 'w') as fileHandle:
+            fileHandle.write(weather_data)
         print("天气文件更新")
     except requests.RequestException as e:
         logging.error("获取天气数据时出现网络错误: %s", e)
@@ -91,8 +79,6 @@ def getWeath(city='101060101'):
 
 try:
     schedule_getWeath()  # 开始调度天气获取函数
-except OSError as e:
-    logging.info(e)
 except KeyboardInterrupt:
     logging.info("检测到键盘中断，正在退出")
 except Exception as e: