nonebot-plugin-railwaytools 2.2.2__tar.gz → 2.2.3__tar.gz

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-railwaytools
-Version: 2.2.2
+Version: 2.2.3
 Summary: 这是一个火车迷也许觉得很好用的铁路机器人工具箱
 Author-email: leaf2006 <leafdeveloper@qq.com>
 License-Expression: MIT
@@ -94,6 +94,8 @@ D3211次列车近8次担当的车组号为：
 2025-11-23 12:59：CRH2B2116
 2025-11-22 12:59：CRH2B2115
 2025-11-21 12:59：CRH2A2006
+
+数据来源：rail.re
 ```
 
 - 通过动车组车组号查询担当车次：`/车次` [动车组车组号] 或 `/cc` [动车组车组号]（例如：/车次 CRH2A-2001）
@@ -110,7 +112,10 @@ CRH2A-2001近8次担当的车次为：
 2025-11-26 10:09：D5665
 2025-11-25 17:29：C3896
 2025-11-25 12:36：C3897
+
+数据来源：rail.re
 ```
+此功能与数据来源的网站一样，支持`简略输入`：CRH2A-2001可以输入2a2001、CR400BF-5033可以输入bf5033，以此类推
 
 <!-- - 通过列车车次查询该车次的始发终到、担当客运段、车型信息以及配属，同时支持动车组与普速列车：`/查询` [列车车次] 或 `/cx` [列车车次] （例如：/查询 Z99）
 ```
@@ -361,8 +366,8 @@ Copyright © Leaf developer 2023-2026
 
 ## TODO 🔜
 
-- ~~当前`/线路`功能存在某线路沿途车站过多而触发`IndexError: list index out of range`的Bug，正在努力修复~~**（已修复）**
-- ~~修复`/大屏`功能~~**（已修复）**
+- ~~当前`/线路`功能存在某线路沿途车站过多而触发`IndexError: list index out of range`的Bug，正在努力修复~~ **（已修复）**
+- ~~修复`/大屏`功能~~ **（已修复）**
 - ~~计划加入生成模拟列车检票大屏的图片的功能，类似CRsim的这种~~ **（这个我计划另写一个插件）**
 - ~~计划加入12306车站大屏功能~~ **（已实现）**
 - ~~正在计划加入12306查询列车始发终到、中途停站的功能~~ **（已实现）**

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/README.md

@@ -76,6 +76,8 @@ D3211次列车近8次担当的车组号为：
 2025-11-23 12:59：CRH2B2116
 2025-11-22 12:59：CRH2B2115
 2025-11-21 12:59：CRH2A2006
+
+数据来源：rail.re
 ```
 
 - 通过动车组车组号查询担当车次：`/车次` [动车组车组号] 或 `/cc` [动车组车组号]（例如：/车次 CRH2A-2001）
@@ -92,7 +94,10 @@ CRH2A-2001近8次担当的车次为：
 2025-11-26 10:09：D5665
 2025-11-25 17:29：C3896
 2025-11-25 12:36：C3897
+
+数据来源：rail.re
 ```
+此功能与数据来源的网站一样，支持`简略输入`：CRH2A-2001可以输入2a2001、CR400BF-5033可以输入bf5033，以此类推
 
 <!-- - 通过列车车次查询该车次的始发终到、担当客运段、车型信息以及配属，同时支持动车组与普速列车：`/查询` [列车车次] 或 `/cx` [列车车次] （例如：/查询 Z99）
 ```
@@ -343,8 +348,8 @@ Copyright © Leaf developer 2023-2026
 
 ## TODO 🔜
 
-- ~~当前`/线路`功能存在某线路沿途车站过多而触发`IndexError: list index out of range`的Bug，正在努力修复~~**（已修复）**
-- ~~修复`/大屏`功能~~**（已修复）**
+- ~~当前`/线路`功能存在某线路沿途车站过多而触发`IndexError: list index out of range`的Bug，正在努力修复~~ **（已修复）**
+- ~~修复`/大屏`功能~~ **（已修复）**
 - ~~计划加入生成模拟列车检票大屏的图片的功能，类似CRsim的这种~~ **（这个我计划另写一个插件）**
 - ~~计划加入12306车站大屏功能~~ **（已实现）**
 - ~~正在计划加入12306查询列车始发终到、中途停站的功能~~ **（已实现）**

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools/emu_function.py

@@ -1,12 +1,14 @@
 # Copyright © Leaf developer 2023-2026
 # 本文件负责实现“通过动车组车次查询车组号”与“通过动车组车组号查询动车组车次”功能
-
+import re
 import httpx
 import json 
+from nonebot import on_regex
 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.params import RawCommand, CommandArg  # type: ignore
 from nonebot.rule import to_me  # type: ignore
 from .utils import utils
 from .api import API  
@@ -19,16 +21,28 @@ announce = "数据来源：rail.re"
 emu_number = on_command("车号",aliases={"ch", "查车号"}, priority=5,block=True)
 train_number = on_command("车次",aliases={"cc", "查车次"}, priority=5,block=True)
 @emu_number.handle()
-async def handle_emu_number(args: Message = CommandArg()): # type: ignore
+async def handle_emu_number(event:Event, args: Message = CommandArg()): # type: ignore
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['车号','ch','查车号']
+    if command_part not in valid_commands:
+        return
+    
     if number := args.extract_plain_text():
         async with httpx.AsyncClient(headers=API.headers) as client:
             try:
                 link_emu_number = API.api_rail_re + 'train/' + number.upper()
                 response = await client.get(link_emu_number)
                 data = json.loads(response.text)
+
+                if not data:
+                    await train_number.send("未查询到相关信息")
+                    return # 防止再次报“FinishedException”错误
+
                 num = len(data)
                 count = 0
                 final_data = ""
+                train_no = data[0]['train_no']
                 for i in range(num):
                     if i <= 7:
                         emu_no = utils.EMU_code_formatter(data[i]['emu_no'])
@@ -37,10 +51,9 @@ async def handle_emu_number(args: Message = CommandArg()): # type: ignore
                         count += 1
                     else:
                         pass
-
                 
                 result = Message([
-                    number.upper(),"次列车近",str(count),"次担当的车组号为：\n",
+                    train_no,"次列车近",str(count),"次担当的车组号为：\n",
                     "------------------------------\n",
                     final_data,
                     "------------------------------\n \n",
@@ -58,16 +71,28 @@ async def handle_emu_number(args: Message = CommandArg()): # type: ignore
         await emu_number.finish("请输入车号")
 
 @train_number.handle() #通过车组号查询车次
-async def handle_train_number(args: Message = CommandArg()): # type: ignore
+async def handle_train_number(event = Event, args: Message = CommandArg()): # type: ignore
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['车次','cc','查车次']
+    if command_part not in valid_commands:
+        return
+
     if number := args.extract_plain_text():  # noqa: F841
         async with httpx.AsyncClient(headers=API.headers) as client:
             try:
                 link_train_number = API.api_rail_re + 'emu/' + number.upper()
                 response = await client.get(link_train_number)
                 data = json.loads(response.text)
+
+                if not data:
+                    await train_number.send("未查询到相关信息")
+                    return
+
                 num = len(data)
                 count = 0
                 final_data = ""
+                emu_number = utils.EMU_code_formatter(data[0]['emu_no'])
                 for i in range(num):
                     if i <= 7:
                         train_no = data[i]['train_no']
@@ -76,9 +101,9 @@ async def handle_train_number(args: Message = CommandArg()): # type: ignore
                         count += 1
                     else:
                         pass
-
-                result = Message([
-                    "车组号",number.upper(),"近",str(count),"次担当的动车组车次为：\n",
+                
+                result = Message([ # TODO 异常处理有问题
+                    "车组号",emu_number,"近",str(count),"次担当的动车组车次为：\n",
                     "------------------------------\n",
                     final_data,
                     "------------------------------\n \n",

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools/picture_function.py

@@ -4,17 +4,25 @@
 import httpx
 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
 from .api import API  
 
 xiaguanzhan_photo = on_command("下关站",aliases={"xgz"},priority=5,block=True)
 EMU_route_schedule = on_command("交路表",aliases={"jlb"},priority=5,block=True)
 
 @xiaguanzhan_photo.handle() #查询下关站列车户口照
-async def handle_xiaguanzhan_photo(args: Message = CommandArg()): # type: ignore
+async def handle_xiaguanzhan_photo(event:Event, args: Message = CommandArg()): # type: ignore
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['下关站','xgz']
+    if command_part not in valid_commands:
+        return
+
     if number := args.extract_plain_text():
         await xiaguanzhan_photo.send("正在加载图片，时间可能略久...")
         photo = API.api_xiaguanzhan + number + ".jpg"
@@ -23,7 +31,13 @@ async def handle_xiaguanzhan_photo(args: Message = CommandArg()): # type: ignore
         await xiaguanzhan_photo.finish("请输入正确的车号!，如：DF7C-5030")
 
 @EMU_route_schedule.handle() # 获取动车组交路表，还是来源于rail.re
-async def handle_EMU_route_schedule(args: Message = CommandArg()):
+async def handle_EMU_route_schedule(event:Event, args: Message = CommandArg()):
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['交路表','jlb']
+    if command_part not in valid_commands:
+        return
+    
     if train_Number_input := args.extract_plain_text():
         res_EMU_route_schedule = API.api_EMU_route_schedule + train_Number_input.upper() + ".png"
         EMU_Route_schedule_result = Message([

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools/route_info.py

@@ -4,6 +4,7 @@
 import httpx
 import json
 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
@@ -14,7 +15,13 @@ from .api import API
 route_info = on_command("线路",aliases={"xl","线路信息","线","铁路"},priority=5,block=True)
 
 @route_info.handle()
-async def handle_route_info(args: Message = CommandArg()):
+async def handle_route_info(event:Event, args: Message = CommandArg()):
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['线路','xl','线路信息','线','铁路']
+    if command_part not in valid_commands:
+        return
+        
     if route_name_input := args.extract_plain_text():
 
         is_hsr = False

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools/station_info.py

@@ -3,7 +3,8 @@
 
 import httpx
 import json 
-from nonebot import on_command 
+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 
@@ -14,7 +15,12 @@ from .api import API
 station_info = on_command("车站",aliases={"cz","车站信息","站"},priority=5,block=True)
 
 @station_info.handle()
-async def handle_station_info(args: Message = CommandArg()):
+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("站","")
@@ -127,7 +133,7 @@ async def handle_station_info(args: Message = CommandArg()):
         except (httpx.ReadTimeout,httpx.ConnectTimeout):
             sta_info_result = "请求超时，请稍等一下再试"
         except Exception as error:
-            route_info_result = "发生异常：" + str(error)
+            sta_info_result = "发生异常：" + str(error)
             
         await station_info.finish(sta_info_result)
 

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools/station_screen.py

@@ -5,6 +5,7 @@ import json
 import datetime  
 import httpx
 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
@@ -17,7 +18,13 @@ station_screen = on_command("大屏",aliases={"dp","车站大屏"},priority=5,bl
 #     return time[11:16]
 
 @station_screen.handle()
-async def handle_station_screen(args: Message = CommandArg()):
+async def handle_station_screen(event:Event, args: Message = CommandArg()):
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['大屏','dp','车站大屏']
+    if command_part not in valid_commands:
+        return
+        
     if station_name_input := args.extract_plain_text():
 
         if "站" in station_name_input:
@@ -52,7 +59,7 @@ async def handle_station_screen(args: Message = CommandArg()):
                         count += 1
 
                     else:
-                        pass
+                        break # 为什么我一直写成pass了
                 station_screen_message = Message([
                     f"【{station_name_input}站】车站大屏如下：\n \n",
                     result,

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools/train_info.py

@@ -5,6 +5,7 @@ import json
 import datetime  
 import httpx
 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
@@ -16,7 +17,13 @@ train_info = on_command("列车查询",aliases={"cx","查询"},priority=5,block=
 
 
 @train_info.handle() # 通过车次查询列车具体信息，不只是能查询动车组，普速列车也可查询
-async def handle_train_info(args: Message = CommandArg()): # type: ignore
+async def handle_train_info(event:Event, args: Message = CommandArg()): # type: ignore
+    raw_message = str(event.get_message()).strip()
+    command_part = utils.get_command_part(raw_message)
+    valid_commands = ['列车查询','cx','查询']
+    if command_part not in valid_commands:
+        return
+        
     if train_number_input := args.extract_plain_text(): 
 
         is_real_time_query = False # 默认参数为False
@@ -90,9 +97,10 @@ async def handle_train_info(args: Message = CommandArg()): # type: ignore
                 jiaolu_dept_train = stop_time[0]["jiaolu_dept_train"] # 车底配属
 
                 if request_dates == toDay:
-                    train_schedule_info = f"{train_code}次{datetime.date.today().strftime("%m月%d日")}{start_station_name}方面正常开行"
+                    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}方面正常开行"
                 else:
-                    train_schedule_info = f"{train_code}次{datetime.date.today().strftime("%m月%d日")}{start_station_name}方面不开行或已停运，请关注车站公告"
+                    train_schedule_info = f"{train_code}次{current_date}{start_station_name}方面不开行或已停运，请关注车站公告"
 
                 stop_inf = []
                 stop_dict = {}
@@ -129,7 +137,7 @@ async def handle_train_info(args: Message = CommandArg()): # type: ignore
                     stop_inf.append(stop_dict)
                     stop_dict = {}
 
-                if is_real_time_query == True: # TODO 这里有问题
+                if is_real_time_query == True:
                     now_time = datetime.datetime.now().strftime("%H:%M")
                     end_station_count = stop_time_count - 1
                     now_station_count = 0

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools/utils.py

@@ -25,4 +25,13 @@ class utils:
             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

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/nonebot_plugin_railwaytools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-railwaytools
-Version: 2.2.2
+Version: 2.2.3
 Summary: 这是一个火车迷也许觉得很好用的铁路机器人工具箱
 Author-email: leaf2006 <leafdeveloper@qq.com>
 License-Expression: MIT
@@ -94,6 +94,8 @@ D3211次列车近8次担当的车组号为：
 2025-11-23 12:59：CRH2B2116
 2025-11-22 12:59：CRH2B2115
 2025-11-21 12:59：CRH2A2006
+
+数据来源：rail.re
 ```
 
 - 通过动车组车组号查询担当车次：`/车次` [动车组车组号] 或 `/cc` [动车组车组号]（例如：/车次 CRH2A-2001）
@@ -110,7 +112,10 @@ CRH2A-2001近8次担当的车次为：
 2025-11-26 10:09：D5665
 2025-11-25 17:29：C3896
 2025-11-25 12:36：C3897
+
+数据来源：rail.re
 ```
+此功能与数据来源的网站一样，支持`简略输入`：CRH2A-2001可以输入2a2001、CR400BF-5033可以输入bf5033，以此类推
 
 <!-- - 通过列车车次查询该车次的始发终到、担当客运段、车型信息以及配属，同时支持动车组与普速列车：`/查询` [列车车次] 或 `/cx` [列车车次] （例如：/查询 Z99）
 ```
@@ -361,8 +366,8 @@ Copyright © Leaf developer 2023-2026
 
 ## TODO 🔜
 
-- ~~当前`/线路`功能存在某线路沿途车站过多而触发`IndexError: list index out of range`的Bug，正在努力修复~~**（已修复）**
-- ~~修复`/大屏`功能~~**（已修复）**
+- ~~当前`/线路`功能存在某线路沿途车站过多而触发`IndexError: list index out of range`的Bug，正在努力修复~~ **（已修复）**
+- ~~修复`/大屏`功能~~ **（已修复）**
 - ~~计划加入生成模拟列车检票大屏的图片的功能，类似CRsim的这种~~ **（这个我计划另写一个插件）**
 - ~~计划加入12306车站大屏功能~~ **（已实现）**
 - ~~正在计划加入12306查询列车始发终到、中途停站的功能~~ **（已实现）**

{nonebot_plugin_railwaytools-2.2.2 → nonebot_plugin_railwaytools-2.2.3}/pyproject.toml

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