nonebot-plugin-railwaytools 2.2.4__tar.gz → 2.2.6__tar.gz

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-railwaytools
-Version: 2.2.4
+Version: 2.2.6
 Summary: 这是一个火车迷也许觉得很好用的铁路机器人工具箱
 Author-email: leaf2006 <leafdeveloper@qq.com>
 License-Expression: MIT
@@ -75,7 +75,7 @@ git clone https://github.com/leaf2006/nonebot-plugin-railwaytools.git
 | `/大屏` [车站名称] | 通过车站名称查看车站大屏（例如：`/大屏` 上海）|
 | `/线路` [线路名称] | 查询某条铁路基本信息（例如：`/线路` 宣杭铁路）|
 | `/车站` [车站名称] | 查询某车站基本信息（例如：`/车站` 上海）|
-| `/下关站` [机车车号] | 通过车号查询下关站机车户口照（例如：`/下关站` DF7C-5030）|
+| `/下关站` [机车车号] | 通过车号查询下关站机车户口照（例如：`/下关站` HXD1D-1898）|
 | `/help` | 查看帮助信息 |
 
 #### 功能详细介绍
@@ -143,7 +143,7 @@ example:
 example:
 🤵：/查询 Z225
 🤖：
-车次：Z225（北京丰台——合肥)
+车次：Z225（北京丰台——合肥）
 担当客运段：合肥客运段
 车型信息：25TAC380V
 配属：合肥车辆段
@@ -165,7 +165,7 @@ Z225次02月06日北京丰台方面正常开行
 example:
 🤵：/查询 Z225 -实时
 🤖：
-车次：Z225（北京丰台——合肥)
+车次：Z225（北京丰台——合肥）
 担当客运段：合肥客运段
 车型信息：25TAC380V
 配属：合肥车辆段
@@ -254,7 +254,6 @@ example:
 🤖：
 【宣杭线】线路信息：
 线路类型：普速铁路
-服务类型：客货两用
 单/复线：复线铁路
 设计时速：暂无数据
 
@@ -291,7 +290,6 @@ example:
 🤖：
 【上海】基础信息如下：
 电报码：SHH
-拼音码：SHA
 所属路局：中国铁路上海局
 位置：上海市 静安区
 本站办理客运业务
@@ -312,12 +310,21 @@ example:
 数据来源：cnrail.geogv.org
 ```
 
-- 通过车号查询下关站收录的机车户口照：`/下关站` [机车车号] 或 `/xgz` [机车车号] （例如：/下关站 DF7C-5030）
+由于cnrail的更新，现在还支持查询地铁车站。建议在查询地铁站时，在地铁站名后加“地铁站”二字，方便搜索
+
+- 通过车号查询下关站收录的机车户口照：`/下关站` [机车车号] 或 `/xgz` [机车车号] （例如：/下关站 HXD1D-1898）
 ```
 example:
-🤵：/下关站 DF7C-5058
+🤵：/下关站 HXD1D-1898
 🤖：正在加载图片，时间可能略久...
-🤖：[DF7C-5058的机车户口照]
+🤖：[HXD1D-1898的机车户口照]
+    【HXD1D-1898】
+    配属：上局沪段
+    生产厂商：株洲
+    拍摄日期：202403
+    拍摄作者：吉亦铭
+
+    数据来源：下关站-铁路摄影馆
 ```
 
 - 帮助：`/帮助` 或 `/help`
@@ -341,7 +348,7 @@ example:
 
 ⑥ 查询某车站基本信息：/车站 或 /cz （例如：/车站 上海）
 
-⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 DF7C-5030）
+⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 HXD1D-1898）
 
 ⑧ 帮助：/帮助 或 /help
 

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/README.md

@@ -57,7 +57,7 @@ git clone https://github.com/leaf2006/nonebot-plugin-railwaytools.git
 | `/大屏` [车站名称] | 通过车站名称查看车站大屏（例如：`/大屏` 上海）|
 | `/线路` [线路名称] | 查询某条铁路基本信息（例如：`/线路` 宣杭铁路）|
 | `/车站` [车站名称] | 查询某车站基本信息（例如：`/车站` 上海）|
-| `/下关站` [机车车号] | 通过车号查询下关站机车户口照（例如：`/下关站` DF7C-5030）|
+| `/下关站` [机车车号] | 通过车号查询下关站机车户口照（例如：`/下关站` HXD1D-1898）|
 | `/help` | 查看帮助信息 |
 
 #### 功能详细介绍
@@ -125,7 +125,7 @@ example:
 example:
 🤵：/查询 Z225
 🤖：
-车次：Z225（北京丰台——合肥)
+车次：Z225（北京丰台——合肥）
 担当客运段：合肥客运段
 车型信息：25TAC380V
 配属：合肥车辆段
@@ -147,7 +147,7 @@ Z225次02月06日北京丰台方面正常开行
 example:
 🤵：/查询 Z225 -实时
 🤖：
-车次：Z225（北京丰台——合肥)
+车次：Z225（北京丰台——合肥）
 担当客运段：合肥客运段
 车型信息：25TAC380V
 配属：合肥车辆段
@@ -236,7 +236,6 @@ example:
 🤖：
 【宣杭线】线路信息：
 线路类型：普速铁路
-服务类型：客货两用
 单/复线：复线铁路
 设计时速：暂无数据
 
@@ -273,7 +272,6 @@ example:
 🤖：
 【上海】基础信息如下：
 电报码：SHH
-拼音码：SHA
 所属路局：中国铁路上海局
 位置：上海市 静安区
 本站办理客运业务
@@ -294,12 +292,21 @@ example:
 数据来源：cnrail.geogv.org
 ```
 
-- 通过车号查询下关站收录的机车户口照：`/下关站` [机车车号] 或 `/xgz` [机车车号] （例如：/下关站 DF7C-5030）
+由于cnrail的更新，现在还支持查询地铁车站。建议在查询地铁站时，在地铁站名后加“地铁站”二字，方便搜索
+
+- 通过车号查询下关站收录的机车户口照：`/下关站` [机车车号] 或 `/xgz` [机车车号] （例如：/下关站 HXD1D-1898）
 ```
 example:
-🤵：/下关站 DF7C-5058
+🤵：/下关站 HXD1D-1898
 🤖：正在加载图片，时间可能略久...
-🤖：[DF7C-5058的机车户口照]
+🤖：[HXD1D-1898的机车户口照]
+    【HXD1D-1898】
+    配属：上局沪段
+    生产厂商：株洲
+    拍摄日期：202403
+    拍摄作者：吉亦铭
+
+    数据来源：下关站-铁路摄影馆
 ```
 
 - 帮助：`/帮助` 或 `/help`
@@ -323,7 +330,7 @@ example:
 
 ⑥ 查询某车站基本信息：/车站 或 /cz （例如：/车站 上海）
 
-⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 DF7C-5030）
+⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 HXD1D-1898）
 
 ⑧ 帮助：/帮助 或 /help
 

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/nonebot_plugin_railwaytools/__init__.py

@@ -53,7 +53,7 @@ async def handle_information_helper():
         "④ 通过车站名称查看车站大屏：/大屏 或 /dp （例如：/大屏 上海）\n \n"
         "⑤ 查询某条铁路基本信息：/线路 或 /xl （例如：/线路 宣杭铁路） \n \n"
         "⑥ 查询某车站基本信息：/车站 或 /cz （例如：/车站 上海） \n \n"
-        "⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 DF7C-5030） \n \n",
+        "⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 HXD1D-1898） \n \n",
         "⑧ 帮助：/帮助 或 /help \n \n",
         "更多功能正在开发中，尽情期待！ \n",
         "------------------------------ \n \n",

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/nonebot_plugin_railwaytools/api.py

@@ -5,9 +5,9 @@ class API:
     api_12306 = "https://mobile.12306.cn/wxxcx/wechat/main/travelServiceQrcodeTrainInfo"
     api_rail_re = "https://api.rail.re/"
     api_EMU_route_schedule = "https://rail.re/img/"
-    api_xiaguanzhan = "http://www.xiaguanzhan.com/uploadfiles/"
+    api_xiaguanzhan = "http://www.xiaguanzhan.com/soso.asp"
     api_station_screen = "https://apis.uctb.cn/api/12306?"
-    api_cnrail_geogv = "http://cnrail.geogv.org/api/v1/"
+    api_cnrail_geogv = "http://cnrail.geogv.org/api/"
     
     headers = { # 加个请求头，保险一点
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/nonebot_plugin_railwaytools/picture_function.py

@@ -6,7 +6,6 @@ from httpx import AsyncClient
 from nonebot import on_command   # type: ignore
 from nonebot.adapters import Event
 from nonebot.adapters.onebot.v11 import Message, MessageSegment   # type: ignore
-from nonebot.plugin import PluginMetadata  # type: ignore
 from nonebot.params import CommandArg  # type: ignore
 from nonebot.rule import to_me  # type: ignore
 from .utils import utils
@@ -25,10 +24,39 @@ async def handle_xiaguanzhan_photo(event:Event, args: Message = CommandArg()): #
 
     if number := args.extract_plain_text():
         await xiaguanzhan_photo.send("正在加载图片，时间可能略久...")
-        photo = API.api_xiaguanzhan + number + ".jpg"
-        await xiaguanzhan_photo.finish(MessageSegment.image(photo))
+        async with httpx.AsyncClient(headers=API.headers, timeout=30.0) as client:
+            data = {
+                "keyword": number.lower() # Fix bug:小补丁
+            }
+            xiaguanzhan_resp = await client.post(API.api_xiaguanzhan, data=data)
+            xiaguanzhan_resp.encoding = "gb2312"
+        # 获取基本信息
+        first_match = utils.xiaguanzhan_first_match
+        title = first_match(r'<h1><span class="blue"><a href="ProView\.asp\?ProId=[^"]*" title="[^"]*" target="_blank">(.*?)</a></span></h1>', xiaguanzhan_resp.text)
+        if title == None:
+            await xiaguanzhan_photo.finish(f"暂无{number}的信息")
+        manufacturer = first_match(r'生产厂商：(.*?)<BR>', xiaguanzhan_resp.text)
+        shoot_date = first_match(r'拍摄日期：(.*?)<BR>', xiaguanzhan_resp.text)
+        shoot_author = first_match(r'拍摄作者：(.*?)</FONT>', xiaguanzhan_resp.text)
+        photo_url = first_match(r'下载地址：<a href="(.*?)" target="_blank">', xiaguanzhan_resp.text)
+
+        title_separate = title.split(' ')
+        locomotive_no = title_separate[1]
+        locomotive_allocation = title_separate[2]
+
+        xiaguanzhan_photo_output = Message ([
+            MessageSegment.image(photo_url),
+            f"【{locomotive_no}】\n",
+            f"配属：{locomotive_allocation}\n",
+            f"生产厂商：{manufacturer}\n",
+            f"拍摄日期：{shoot_date}\n",
+            f"拍摄作者：{shoot_author}\n\n",
+            "数据来源：下关站-铁路摄影馆",
+        ])
+        await xiaguanzhan_photo.finish(xiaguanzhan_photo_output)
+
     else:
-        await xiaguanzhan_photo.finish("请输入正确的车号!，如：DF7C-5030")
+        await xiaguanzhan_photo.finish("请输入正确的车号!，如：HXD1D-1898")
 
 @EMU_route_schedule.handle() # 获取动车组交路表，还是来源于rail.re
 async def handle_EMU_route_schedule(event:Event, args: Message = CommandArg()):

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/nonebot_plugin_railwaytools/route_info.py

@@ -43,102 +43,72 @@ async def handle_route_info(event:Event, args: Message = CommandArg()):
                 if not res_search_data:
                     await route_info.finish("未收录该线路或线路不存在，请重新输入！")
                 else:
-                    for i in range(len(res_search_data)): # 搜索在所有搜索结果中属于“铁路”类别的条目
-                        if res_search_data[i][1] == "RAIL":
+                    for search_results in res_search_data: # 搜索在所有搜索结果中属于“铁路”类别的条目
+                        search_query = search_results['query']
+                        search_name = search_results['name']
+                        if "rail/" in search_query:
                             if is_hsr == False:
-                                if "高速" not in res_search_data[i][2]:
+                                if "高速" not in search_name:
                                     break
                             else:
                                 break
-
-                    rail_id = res_search_data[i][0]
+                    rail_id = search_query.replace("rail/","") # 去除query中的前缀rail/，这部分将不作为rail_id使用
                 
-                # print(rail_id)
-                url_route_info = f"{API.api_cnrail_geogv}rail/{rail_id}?locale=zhcn"
+                url_route_info = f"{API.api_cnrail_geogv}feature/{rail_id}?locale=zhcn" # 已更新为新版调用方式
                 route_info_res = await client.get(url_route_info)
                 route_info_raw_data = json.loads(route_info_res.text)
                 route_info_data = route_info_raw_data['data']
 
                 route_info_name = route_info_data['name'] # 线路名称
 
-                if route_info_data['lineNum'] == "2": # 线路形态
+                if route_info_data['lines'] == "2": # 线路形态
                     route_info_linenum = "复线铁路"
-                elif route_info_data['lineNum'] == "1":
+                elif route_info_data['lines'] == "1":
                     route_info_linenum = "单线铁路"
                 else:
-                    route_info_linenum = route_info_data['lineNum']
+                    route_info_linenum = route_info_data['lines']
                 
-                if not route_info_data['designSpeed'] or route_info_data['designSpeed'].strip() == "null": # 设计时速
+                design_speed_raw = route_info_data.get("design_speed")
+                if not design_speed_raw or str(design_speed_raw).strip().lower() == "null":
                     route_info_designSpeed = "暂无数据"
                 else:
-                    route_info_designSpeed = route_info_data['designSpeed']
+                    route_info_designSpeed = str(design_speed_raw)
 
-                if route_info_data['railService'] == "F": # 服务类型
-                    route_info_railService = "货运"
-                elif route_info_data['railService'] == "P":
-                    route_info_railService = "客运"
-                elif route_info_data['railService'] == "PF":
-                    route_info_railService = "客货两用"
-                elif route_info_data['railService'] == "P2F1":
-                    route_info_railService = "客运为主，兼顾货运"
-                else:
-                    route_info_railService = route_info_data['railService']
-                
-                if route_info_data['railType'] == "CONV": # 线路类型
-                    route_info_railType = "普速铁路"
-                elif route_info_data['railType'] == "RR":
-                    route_info_railType = "快速铁路"
-                elif route_info_data['railType'] == "HSR":
-                    route_info_railType = "高速铁路"
-                else:
-                    route_info_railType = route_info_data['railType']
+                route_info_railType = route_info_data['railtype'] # 新版模式
                 
-                if route_info_data['diagram'] == "null":
-                    route_info_diagram = "暂无沿途车站数据"
+                # 作者心还怪好的，新版调用方式的那个stations确实比原来的好
+                stations_list = route_info_data['stations']
+                if not stations_list or stations_list == "null":
+                    route_info_stations = "暂无沿途车站数据"
                 else:
-                    raw_diagram = route_info_data['diagram']['records']
-                    # route_info_diagram = raw_diagram[num][3][0][2]
-                    route_info_diagram = ""
-                    num = 0
-                    count = 1
-                    count_raw_diagram = len(raw_diagram) - 1
-                    while num < count_raw_diagram:
-                        if not raw_diagram[num][3] or raw_diagram[num][2] not in ['SST','MST']:
-                            num += 1
-                            continue
-
-                        station_name = raw_diagram[num][3][0][2]
-                        raw_kilometerage = str(raw_diagram[num][1])
-                        if raw_kilometerage.strip() == "":
+                    route_info_stations = ""
+                    for counts in range(len(stations_list)):
+                        station_name = stations_list[counts]['name']
+                        kilometerage_raw = stations_list[counts]['mileage']
+                        if kilometerage_raw is None:
                             kilometerage = ""
                         else:
-                            kilometerage = f"{raw_kilometerage}Km"
-                        route_info_diagram += f"【{str(count)}】{station_name}         {kilometerage} \n"
-                        count += 1
-                        num += 1
-
+                            kilometerage = f"{kilometerage_raw}Km"
+                        route_info_stations += f"【{str(counts+1)}】{station_name}         {kilometerage} \n"
 
+                # 这里跟随原网站弃用“服务类型”
                 route_info_result = Message([
-                    # "线路名称：",route_info_name,"\n",
                     "【",route_info_name,"】线路信息：\n"
                     "线路类型：",route_info_railType,"\n",
-                    "服务类型：",route_info_railService,"\n",
                     "单/复线：",route_info_linenum,"\n",
                     "设计时速：",route_info_designSpeed,"\n \n",
                     "----------沿途车站----------\n",
-                    route_info_diagram,
+                    route_info_stations,
                     "------------------------------ \n \n",
                     "*本表所列起点终点为该线路里程接算站，里程为营业用运价里程，与线路实际运行长度并不相同\n"
                     "数据来源：cnrail.geogv.org",
-
                 ])
 
         except (httpx.ReadTimeout,httpx.ConnectTimeout):
             route_info_result = "请求超时，请稍等一下再试"
         except Exception as error:
-            route_info_result = "发生异常：" + str(error)
+            route_info_result = "发生异常：" + str(error) # TODO
 
-        
         await route_info.finish(route_info_result)
 
     else:

nonebot_plugin_railwaytools-2.2.6/nonebot_plugin_railwaytools/station_info.py

@@ -0,0 +1,140 @@
+# Copyright © Leaf developer 2023-2026
+# 本文件负责实现“查询车站信息”功能
+
+import httpx
+import json 
+from nonebot import on_command
+from nonebot.adapters import Event 
+from nonebot.adapters.onebot.v11 import Message, MessageSegment 
+from nonebot.plugin import PluginMetadata
+from nonebot.params import CommandArg 
+from nonebot.rule import to_me
+from .utils import utils 
+from .api import API
+
+station_info = on_command("车站",aliases={"cz","车站信息","站"},priority=5,block=True)
+
+@station_info.handle()
+async def handle_station_info(event:Event, args: Message = CommandArg()):
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['车站','cz','车站信息','站']
+    if command_part not in valid_commands:
+        return    
+    if station_name_input := args.extract_plain_text():
+        is_metro_sta = False
+        if "地铁站" in station_name_input:
+            station_name_input = station_name_input.replace("地铁站","")
+            is_metro_sta = True
+        elif "站" in station_name_input: # 防止搜索出现问题
+            station_name_input = station_name_input.replace("站","")
+        elif "车站" in station_name_input:
+            station_name_input = station_name_input.replace("车站","")
+        else:
+            pass
+
+        try:
+            async with httpx.AsyncClient(headers=API.headers) as client:
+                res_search_data = await utils.cnrail_search(station_name_input)
+                if not res_search_data:
+                    await station_info.finish("未收录该车站或车站不存在，请重新输入！")
+                else:
+                    # 为了适应网站加入了地铁的新特性，将搜索与获取数据两步放在一起，便于对地铁车站与国铁车站重名现象的处理
+                    sta_info_formatted_data = ""
+                    for search_results in res_search_data:
+                        search_query = search_results['query']
+                        search_name = search_results['name']
+                        if "geo/" in search_query and station_name_input == search_name:
+                            sta_id = search_query.replace("geo/","")
+                            url_sta_info = f"{API.api_cnrail_geogv}poi/{sta_id}?locale=zhcn"
+                            sta_info_res = await client.get(url_sta_info)
+                            sta_info_formatted_data = utils.decrypt_cnrail_data(sta_info_res.text)
+
+                            if is_metro_sta == True:
+                                if sta_info_formatted_data['featureType'] == "地铁站":
+                                    break
+                            else:
+                                if sta_info_formatted_data['featureType'] == "火车站":
+                                    break
+
+                sta_status_judge = sta_info_formatted_data['featureType'] # 上一步判断车站类型是为了筛选重名地铁站，防止误选，这里不是
+                if sta_status_judge == "地铁站":
+                    is_metro_sta = True
+
+                sta_detail = sta_info_formatted_data['exd'][0]['data']
+                # 站名
+                if is_metro_sta == True:
+                    sta_name = sta_info_formatted_data['name'] + "地铁站"
+                else:
+                    sta_name = sta_info_formatted_data['name']
+                
+                # 电报码
+                sta_telecode_raw = sta_detail.get("tele_code")
+                if not sta_telecode_raw or str(sta_telecode_raw).strip() == "null":
+                    sta_telecode = ""
+                else:
+                    sta_telecode = f"电报码：{sta_detail['tele_code']}\n"
+                
+                sta_bureau = f"所属单位：{sta_detail['operators'][0]['name']}\n"
+                sta_location = f"位置：{sta_info_formatted_data['location']}\n"
+
+                serviceclass_judge = sta_detail.get('trainservice')
+                if is_metro_sta == True:
+                    sta_serviceclass = "" # 地铁车站特殊处理                
+                elif not serviceclass_judge and is_metro_sta == False:
+                    sta_serviceclass = "本站不办理客运业务\n"
+                else:
+                    sta_serviceclass = "本站办理客运业务\n"
+                
+                hr_line = "------------------------------ \n"
+                # 沿途车站
+                
+                if not sta_detail.get('connection'):
+                    sta_route_info = f"{hr_line}暂无该车站线路数据\n"
+                else:
+                    sta_route_data = sta_detail['connection']
+                    sta_route_info = ""
+                    for route in sta_route_data:
+                        linename = route['linename']
+                        next_data = route['next'][0]
+                        if next_data.get('adj'): # 如果下一站不是null，则必然有dest_station；如果下一站是null，本站必然是终点站
+                            next_sta = next_data['adj']['name']
+                            next_dest_sta = f"（{next_data['dest']['name']}）方向"
+                        else:
+                            if next_data['dest']['status'] == "END":
+                                next_sta = "起迄站"
+                                next_dest_sta = ""
+
+                        prev_data = route['prev'][0]
+                        if prev_data.get('adj'):
+                            prev_sta = prev_data['adj']['name']
+                            prev_dest_sta = f"（{prev_data['dest']['name']}）方向"
+                        else:
+                            if prev_data['dest']['status'] == "END":
+                                prev_sta = "起迄站"
+                                prev_dest_sta = ""
+                    
+                        sta_route_info += f"{hr_line}【{linename}】\n下站{next_dest_sta}：{next_sta}\n上站{prev_dest_sta}：{prev_sta}\n"
+                         # TODO
+
+                sta_info_result = Message([
+                    "【",sta_name,"】基础信息如下：\n",
+                    sta_telecode,
+                    sta_bureau,
+                    sta_location,
+                    sta_serviceclass,
+                    sta_route_info,
+                    "------------------------------\n \n",
+                    "数据来源：cnrail.geogv.org",
+
+                ])
+        except (httpx.ReadTimeout,httpx.ConnectTimeout):
+            sta_info_result = "请求超时，请稍等一下再试"
+        except Exception as error:
+            sta_info_result = "发生异常：" + str(error)
+            
+        await station_info.finish(sta_info_result)
+
+    else:
+        await station_info.finish("请输入线路名称")
+        

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/nonebot_plugin_railwaytools/train_info.py

@@ -4,7 +4,6 @@
 import json
 import datetime  
 import httpx
-import traceback
 from nonebot import on_command,logger   # type: ignore
 from nonebot.adapters import Event
 from nonebot.adapters.onebot.v11 import Message, MessageSegment   # type: ignore
@@ -72,16 +71,15 @@ async def handle_train_info(event:Event, args: Message = CommandArg()): # type:
 
                 # 对返回数据进行分析
                 stop_time = info_response_data['data']['trainDetail']['stopTime']
-                # 此处控制台会输出warning，但是可以忽略，因为是12306的问题
 
-                train_code = stop_time[0]['stationTrainCode'] # 车次
+                train_code_raw = stop_time[0]['stationTrainCode'] # 原始车次，根据始发站时的车次来判断
+                train_code_display = info_response_data['data']['trainDetail']['stationTrainCodeAll'] # 车次（全部）
                 start_station_name = stop_time[0]['start_station_name'] # 始发站名
                 end_station_name = stop_time[0]['end_station_name'] # 终到站名
 
                 jiaolu_corporation_code = stop_time[0]["jiaolu_corporation_code"] # 担当客运段
                 if info_data["trainCode"][0] == "D" or info_data["trainCode"][0] == "G" or info_data["trainCode"][0] == "C":
-                    # url_emu_code = API.api_rail_re + "train/" + info_data["trainCode"]
-                    url_emu_code = f"{API.api_rail_re}train/{train_code}"
+                    url_emu_code = f"{API.api_rail_re}train/{train_code_raw}"
                     res_info_EMU = await client.get(url_emu_code)
                     info_EMU_code = json.loads(res_info_EMU.text)
                     if res_info_EMU.status_code == 404 or not info_EMU_code:
@@ -99,9 +97,9 @@ async def handle_train_info(event:Event, args: Message = CommandArg()): # type:
 
                 if request_dates == toDay:
                     current_date = datetime.date.today().strftime('%m月%d日') # Bug fixed：https://github.com/leaf2006/nonebot-plugin-railwaytools/issues/2
-                    train_schedule_info = f"{train_code}次{current_date}{start_station_name}方面正常开行"
+                    train_schedule_info = f"{train_code_raw}次{current_date}{start_station_name}方面正常开行"
                 else:
-                    train_schedule_info = f"{train_code}次{current_date}{start_station_name}方面不开行或已停运，请关注车站公告"
+                    train_schedule_info = f"{train_code_raw}次{current_date}{start_station_name}方面不开行或已停运，请关注车站公告"
 
                 stop_inf = []
                 stop_dict = {}
@@ -114,6 +112,7 @@ async def handle_train_info(event:Event, args: Message = CommandArg()): # type:
                     stopover_time = stop['stopover_time'] + "分"
                     ticketDelay = stop['ticketDelay']
                     day_difference = stop['dayDifference']
+                    train_code_now = stop['stationTrainCode'] # 当前车次
                     stop_time_count = len(stop_time)
 
                     if i == 0: # 判断始发/终到站，给不存在的到点/发点变成“--:--”
@@ -135,6 +134,7 @@ async def handle_train_info(event:Event, args: Message = CommandArg()): # type:
                     stop_dict.setdefault("发点",start_time)
                     stop_dict.setdefault("停车时间",stopover_time)
                     stop_dict.setdefault("day_difference",day_difference)
+                    stop_dict.setdefault("当前车次",train_code_now)
                     stop_inf.append(stop_dict)
                     stop_dict = {}
 
@@ -172,10 +172,14 @@ async def handle_train_info(event:Event, args: Message = CommandArg()): # type:
 
                 station_result = ""
                 count = 1 # 给时刻表标上序号
-                # day_difference_buffer = 0
-                # day_differences = [int(stop.get('day_difference', 0)) for stop in stop_inf]
+
+                train_code_compare = train_code_raw
                 for i,stop in enumerate(stop_inf): # 想办法整出时刻表的结果，最后将结果添加到Message中去
-                    # day_difference_output = ""
+                    if stop['当前车次'] != train_code_compare:
+                        train_code_change_alarm = f"【列车自当前车站起车次号变更为{stop['当前车次']}】\n"
+                        train_code_compare = stop['当前车次']
+                    else:
+                        train_code_change_alarm = ""
 
                     if is_real_time_query == True:
                         if request_dates != toDay:
@@ -191,12 +195,12 @@ async def handle_train_info(event:Event, args: Message = CommandArg()): # type:
                     else:
                         delay = ""
                     
-                    station_result += str(count) + "." + stop['站点'] + "：" + stop['到点'] + "到," + stop['发点'] + "开，停车" + stop['停车时间'] + delay + "\n"
+                    station_result += str(count) + "." + stop['站点'] + "：" + stop['到点'] + "到," + stop['发点'] + "开，停车" + stop['停车时间'] + delay + "\n" + train_code_change_alarm
                     count += 1
 
                 train_info_output = Message([ # 结果Message
-                    "车次：",train_code,
-                    "（",start_station_name , "——" , end_station_name , ") \n",
+                    "车次：",train_code_display,
+                    "（",start_station_name , "——" , end_station_name , "） \n",
                     "担当客运段：" , jiaolu_corporation_code , "\n",
                     "车型信息：" , jiaolu_train_style , "\n",
                     "配属：" , jiaolu_dept_train , "\n",

nonebot_plugin_railwaytools-2.2.6/nonebot_plugin_railwaytools/utils.py

@@ -0,0 +1,95 @@
+import re
+import json
+import httpx
+import asyncio
+import traceback
+
+from .api import API
+
+class utils:
+    """存放各类需要的def定义"""
+    def time_Formatter_1(time) -> str:
+        """格式化时间，1145 -> 11:45"""
+        return time[:2] + ":" + time[2:]
+
+    def time_Formatter_2(time) -> str:
+        """格式化时间，2025-12-17 14:50:00 -> 14:50"""
+        return time[11:16]
+    def EMU_code_formatter(str):
+        """格式化动车组车号 CRH2A2001 -> CRH2A-2001"""
+        return str[:-4] + "-" + str[-4:]
+
+    async def cnrail_search(input_text):
+        """cnrail的搜索模块，获取rail id必用"""
+        url_search = f"{API.api_cnrail_geogv}search?keyword={input_text}" 
+        async with httpx.AsyncClient(headers=API.headers) as client:
+            res_search = await client.get(url_search)
+            res_search_data = json.loads(res_search.text) # Fixed:适配新版api调用方式
+            return res_search_data
+        
+    def get_command_part(raw_message):
+        """
+        获取命令部分
+        """
+        space_index = raw_message.find(' ') # 找到空格所在的位置（空格用于分隔指令与参数）
+        if space_index != -1:
+            command_part = raw_message[:space_index]
+        else:
+            command_part = raw_message
+        
+        command_part = command_part.replace('/','')
+        return command_part
+    
+    def short_tb(exc: Exception) -> str:
+        """
+        用于精简TraceBack
+        """
+        te = traceback.TracebackException.from_exception(exc)
+        if te.stack:
+            last = te.stack[-1]
+            # 只保留最后一帧
+            frame = f'File "{last.filename}", line {last.lineno}, in {last.name}\n    {last.line}'
+        else:
+            frame = "No traceback frame"
+        exc_only = "".join(te.format_exception_only()).strip()
+        return f"{frame}\n{exc_only}"
+    
+    def decrypt_cnrail_data(encrypted_str: str) -> dict:
+        """
+        解密 cnrail.geogv.org API 返回的混淆字符串
+        """
+
+        # 如果最外层包着多余的引号，先通过 json.loads 脱掉引号转为正常的内部字符串
+        if encrypted_str.startswith('"') and encrypted_str.endswith('"'):
+            try:
+                encrypted_str = json.loads(encrypted_str)
+            except json.JSONDecodeError:
+                pass
+        
+        if not encrypted_str:
+            return "ERR"
+        
+        key_length = ord(encrypted_str[0]) # 第一位字符的 ASCII 码值代表密钥的长度，如结果为\u0007则提取为7
+        key = encrypted_str[1:1+key_length] # 紧接着的key_length个字符是密钥
+        payload = encrypted_str[1+key_length:] # 剩下的都是加密过的密文
+
+        # 解密部分
+        decrypted_chars = []
+        for i, char in enumerate(payload):
+            key_char = key[i % len(key)]
+
+            # 密文字符 ASCII - 密钥字符 ASCII = 原文字符 ASCII
+            decrypted_char_code = ord(char) - ord(key_char)
+            decrypted_chars.append(chr(decrypted_char_code)) # 由ASCII解密为普通字符串
+        
+        decrypted_str = "".join(decrypted_chars)
+
+        try:
+            return json.loads(decrypted_str)
+        except json.JSONDecodeError:
+            return "ERR"
+    
+    def xiaguanzhan_first_match(pattern, text):
+        m = re.search(pattern, text, re.IGNORECASE)
+        return m.group(1).strip() if m else None
+

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/nonebot_plugin_railwaytools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-railwaytools
-Version: 2.2.4
+Version: 2.2.6
 Summary: 这是一个火车迷也许觉得很好用的铁路机器人工具箱
 Author-email: leaf2006 <leafdeveloper@qq.com>
 License-Expression: MIT
@@ -75,7 +75,7 @@ git clone https://github.com/leaf2006/nonebot-plugin-railwaytools.git
 | `/大屏` [车站名称] | 通过车站名称查看车站大屏（例如：`/大屏` 上海）|
 | `/线路` [线路名称] | 查询某条铁路基本信息（例如：`/线路` 宣杭铁路）|
 | `/车站` [车站名称] | 查询某车站基本信息（例如：`/车站` 上海）|
-| `/下关站` [机车车号] | 通过车号查询下关站机车户口照（例如：`/下关站` DF7C-5030）|
+| `/下关站` [机车车号] | 通过车号查询下关站机车户口照（例如：`/下关站` HXD1D-1898）|
 | `/help` | 查看帮助信息 |
 
 #### 功能详细介绍
@@ -143,7 +143,7 @@ example:
 example:
 🤵：/查询 Z225
 🤖：
-车次：Z225（北京丰台——合肥)
+车次：Z225（北京丰台——合肥）
 担当客运段：合肥客运段
 车型信息：25TAC380V
 配属：合肥车辆段
@@ -165,7 +165,7 @@ Z225次02月06日北京丰台方面正常开行
 example:
 🤵：/查询 Z225 -实时
 🤖：
-车次：Z225（北京丰台——合肥)
+车次：Z225（北京丰台——合肥）
 担当客运段：合肥客运段
 车型信息：25TAC380V
 配属：合肥车辆段
@@ -254,7 +254,6 @@ example:
 🤖：
 【宣杭线】线路信息：
 线路类型：普速铁路
-服务类型：客货两用
 单/复线：复线铁路
 设计时速：暂无数据
 
@@ -291,7 +290,6 @@ example:
 🤖：
 【上海】基础信息如下：
 电报码：SHH
-拼音码：SHA
 所属路局：中国铁路上海局
 位置：上海市 静安区
 本站办理客运业务
@@ -312,12 +310,21 @@ example:
 数据来源：cnrail.geogv.org
 ```
 
-- 通过车号查询下关站收录的机车户口照：`/下关站` [机车车号] 或 `/xgz` [机车车号] （例如：/下关站 DF7C-5030）
+由于cnrail的更新，现在还支持查询地铁车站。建议在查询地铁站时，在地铁站名后加“地铁站”二字，方便搜索
+
+- 通过车号查询下关站收录的机车户口照：`/下关站` [机车车号] 或 `/xgz` [机车车号] （例如：/下关站 HXD1D-1898）
 ```
 example:
-🤵：/下关站 DF7C-5058
+🤵：/下关站 HXD1D-1898
 🤖：正在加载图片，时间可能略久...
-🤖：[DF7C-5058的机车户口照]
+🤖：[HXD1D-1898的机车户口照]
+    【HXD1D-1898】
+    配属：上局沪段
+    生产厂商：株洲
+    拍摄日期：202403
+    拍摄作者：吉亦铭
+
+    数据来源：下关站-铁路摄影馆
 ```
 
 - 帮助：`/帮助` 或 `/help`
@@ -341,7 +348,7 @@ example:
 
 ⑥ 查询某车站基本信息：/车站 或 /cz （例如：/车站 上海）
 
-⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 DF7C-5030）
+⑦ 通过车号查询下关站机车户口照：/下关站 或 /xgz （例如：/下关站 HXD1D-1898）
 
 ⑧ 帮助：/帮助 或 /help
 

{nonebot_plugin_railwaytools-2.2.4 → nonebot_plugin_railwaytools-2.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-railwaytools"
-version = "2.2.4"
+version = "2.2.6"
 description = "这是一个火车迷也许觉得很好用的铁路机器人工具箱"
 authors = [
     { name = "leaf2006", email = "leafdeveloper@qq.com" }

nonebot_plugin_railwaytools-2.2.4/nonebot_plugin_railwaytools/station_info.py

@@ -1,142 +0,0 @@
-# Copyright © Leaf developer 2023-2026
-# 本文件负责实现“查询车站信息”功能
-
-import httpx
-import json 
-from nonebot import on_command
-from nonebot.adapters import Event 
-from nonebot.adapters.onebot.v11 import Message, MessageSegment 
-from nonebot.plugin import PluginMetadata
-from nonebot.params import CommandArg 
-from nonebot.rule import to_me
-from .utils import utils 
-from .api import API
-
-station_info = on_command("车站",aliases={"cz","车站信息","站"},priority=5,block=True)
-
-@station_info.handle()
-async def handle_station_info(event:Event, args: Message = CommandArg()):
-    raw_message = str(event.get_message()).strip()
-    command_part = utils.get_command_part(raw_message)
-    valid_commands = ['车站','cz','车站信息','站']
-    if command_part not in valid_commands:
-        return    
-    if station_name_input := args.extract_plain_text():
-        if "站" in station_name_input: # 防止搜索出现问题
-            station_name_input = station_name_input.replace("站","")
-        elif "车站" in station_name_input:
-            station_name_input = station_name_input("车站","")
-        else:
-            pass
-
-        try:
-            async with httpx.AsyncClient(headers=API.headers) as client:
-                res_search_data = await utils.cnrail_search(station_name_input)
-                if not res_search_data:
-                    await station_info.finish("未收录该车站或车站不存在，请重新输入！")
-                else:
-                    for i in range(len(res_search_data)): # 搜索所有搜索结果中属于“车站”类别的 条目
-                        if res_search_data[i][2] == station_name_input and res_search_data[i][1] == "STATION":
-                            continue_search = False
-                            break
-                        else:
-                            continue_search = True
-                    
-                    if continue_search == True:
-                        for i in range(len(res_search_data)):
-                            if res_search_data[i][1] == "STATION":
-                                break
-                    else:
-                        pass        
-
-                    rail_id = res_search_data[i][0]
-
-                url_sta_basic_info = f"{API.api_cnrail_geogv}station/{rail_id}?locale=zhcn&query-override=&requestGeom=true" # 车站基本信息
-                url_sta_route_info = f"{API.api_cnrail_geogv}station-link/{rail_id}?locale=zhcn&query-override=" # 车站所属线路
-                
-                sta_basic_info_res = await client.get(url_sta_basic_info)
-                sta_basic_info_data = json.loads(sta_basic_info_res.text) # 返回数据直接可以使用，没有套了个"data":{}的壳
-                
-                sta_route_info_res = await client.get(url_sta_route_info)
-                sta_route_info_rawdata = json.loads(sta_route_info_res.text)
-
-                sta_telecode_rawdata = sta_basic_info_data['teleCode'] # 电报码
-                sta_pinyincode_rawdata = sta_basic_info_data['pinyinCode'] # 拼音码
-                sta_location_rawdata = sta_basic_info_data['location'] # 所在地点
-                sta_serviceclass_rawdata = sta_basic_info_data['serviceClass'] # 服务类型
-
-                sta_name = sta_basic_info_data['localName'] # 车站名称
-                sta_bureau = "所属路局：" + sta_basic_info_data['bureau'].get("name") + "\n" # 所属单位
-                
-                if not sta_telecode_rawdata or sta_telecode_rawdata.strip() == "null":
-                    sta_telecode = ""
-                else:
-                    sta_telecode = f"电报码：{sta_telecode_rawdata}\n"
-
-                if not sta_pinyincode_rawdata or sta_pinyincode_rawdata.strip() == "null":
-                    sta_pinyincode = ""
-                else:
-                    sta_pinyincode = f"拼音码：{sta_pinyincode_rawdata}\n"
-
-                if not sta_location_rawdata or sta_location_rawdata.strip() == "null":
-                    sta_location = ""
-                else:
-                    sta_location = f"位置：{sta_location_rawdata}\n" 
-
-                if sta_serviceclass_rawdata == "":
-                    sta_serviceclass = "本站不办理客运业务\n"
-                else:
-                    sta_serviceclass = "本站办理客运业务\n"
-
-                hr_line = "------------------------------ \n"
-                if sta_route_info_rawdata['success'] == False:
-                    sta_route_info_result = f"{hr_line}暂无该车站线路数据\n"
-                else:
-                    sta_route_info_data = sta_route_info_rawdata['data']
-                    sta_route_info_result = ""
-                    for i in range(len(sta_route_info_data)):
-                        railname = sta_route_info_data[i]['railName']
-
-                        next_station_raw = sta_route_info_data[i]['next'][0][2]
-                        terminal_station_raw = sta_route_info_data[i]['next'][0][8]
-                        if next_station_raw == "*" and terminal_station_raw == "*":
-                            next_station = "起迄站"
-                            terminal_station = ""
-                        else:
-                            next_station = next_station_raw
-                            terminal_station = f"（{terminal_station_raw}）方向"
-
-                        prev_station_raw = sta_route_info_data[i]['prev'][0][2]
-                        starting_station_raw = sta_route_info_data[i]['prev'][0][8]
-                        if prev_station_raw == "*" and starting_station_raw == "*":
-                            prev_station = "起迄站"
-                            starting_station = ""
-                        else:
-                            prev_station = prev_station_raw
-                            starting_station = f"（{starting_station_raw}）方向"
-
-                        sta_route_info_result += f"{hr_line}【{railname}】\n 下站{terminal_station}：{next_station}\n 上站{starting_station}：{prev_station}\n"
-
-
-                sta_info_result = Message([
-                    "【",sta_name,"】基础信息如下：\n",
-                    sta_telecode,
-                    sta_pinyincode,
-                    sta_bureau,
-                    sta_location,
-                    sta_serviceclass,
-                    sta_route_info_result,
-                    "------------------------------\n \n",
-                    "数据来源：cnrail.geogv.org",
-
-                ])
-        except (httpx.ReadTimeout,httpx.ConnectTimeout):
-            sta_info_result = "请求超时，请稍等一下再试"
-        except Exception as error:
-            sta_info_result = "发生异常：" + str(error)
-            
-        await station_info.finish(sta_info_result)
-
-    else:
-        await station_info.finish("请输入线路名称")
-        

nonebot_plugin_railwaytools-2.2.4/nonebot_plugin_railwaytools/utils.py

@@ -1,55 +0,0 @@
-import json
-import httpx
-import asyncio
-import traceback
-
-from .api import API
-
-class utils:
-    """存放各类需要的def定义"""
-    def time_Formatter_1(time) -> str:
-        """格式化时间，1145 -> 11:45"""
-        return time[:2] + ":" + time[2:]
-
-    def time_Formatter_2(time) -> str:
-        """格式化时间，2025-12-17 14:50:00 -> 14:50"""
-        return time[11:16]
-    def EMU_code_formatter(str):
-        """格式化动车组车号 CRH2A2001 -> CRH2A-2001"""
-        return str[:-4] + "-" + str[-4:]
-
-    async def cnrail_search(input_text):
-        """cnrail的搜索模块，获取rail id必用"""
-        url_search = f"{API.api_cnrail_geogv}match_feature/{input_text}?locale=zhcn&query-override" 
-        async with httpx.AsyncClient(headers=API.headers) as client:
-            res_search = await client.get(url_search)
-            res_search_raw_data = json.loads(res_search.text)
-            res_search_data = res_search_raw_data['data']
-            return res_search_data
-        
-    def get_command_part(raw_message):
-        """
-        获取命令部分
-        """
-        space_index = raw_message.find(' ') # 找到空格所在的位置（空格用于分隔指令与参数）
-        if space_index != -1:
-            command_part = raw_message[:space_index]
-        else:
-            command_part = raw_message
-        
-        command_part = command_part.replace('/','')
-        return command_part
-    
-    def short_tb(exc: Exception) -> str:
-        """
-        用于精简TraceBack
-        """
-        te = traceback.TracebackException.from_exception(exc)
-        if te.stack:
-            last = te.stack[-1]
-            # 只保留最后一帧
-            frame = f'File "{last.filename}", line {last.lineno}, in {last.name}\n    {last.line}'
-        else:
-            frame = "No traceback frame"
-        exc_only = "".join(te.format_exception_only()).strip()
-        return f"{frame}\n{exc_only}"