Skip to content

Commit

Permalink
tip when passed invalid arg
Browse files Browse the repository at this point in the history
  • Loading branch information
lgc2333 committed Dec 18, 2023
1 parent d765087 commit d21bf0d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ Telegram:[@lgc2333](https://t.me/lgc2333)

## 📝 更新日志

### 0.1.4

- 现在缺少参数会提示了

### 0.1.3

- fix [#2](https://github.com/lgc-NB2Dev/nonebot-plugin-cnrail/issues/2)
Expand Down
2 changes: 1 addition & 1 deletion nonebot_plugin_cnrail/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from . import __main__ as __main__ # noqa: E402
from .config import ConfigModel # noqa: E402

__version__ = "0.1.3"
__version__ = "0.1.4"
__plugin_meta__ = PluginMetadata(
name="CNRail",
description="查询 12306 列车时刻表",
Expand Down
27 changes: 14 additions & 13 deletions nonebot_plugin_cnrail/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
from datetime import date, datetime
from typing import Optional

from arclet.alconna import Alconna, Args, CommandMeta
from arclet.alconna import Alconna, Args, Arparma, CommandMeta
from httpx import TimeoutException
from nonebot import logger
from nonebot_plugin_alconna import AlconnaMatcher, Query, on_alconna
from nonebot_plugin_alconna.uniseg import Image, UniMessage
from nonebot_plugin_alconna import AlconnaMatcher, on_alconna
from nonebot_plugin_alconna.uniseg import UniMessage

from .data_source import MultipleTrainFoundError, query_train_info, render_train_info

Expand Down Expand Up @@ -44,19 +44,21 @@ def parse(df: str) -> Optional[date]:
),
),
aliases={"列车信息", "查询列车"},
auto_send_output=True,
skip_for_unmatch=False,
use_cmd_start=True,
)


@search_train_info.handle()
async def _(
matcher: AlconnaMatcher,
train_no_query: Query[str] = Query("train"),
date_query: Query[Optional[str]] = Query("date", None),
):
train_no: str = train_no_query.result
train_date: Optional[str] = date_query.result
async def _(matcher: AlconnaMatcher, parma: Arparma):
if parma.error_info:
await matcher.finish(f"{parma.error_info}\n使用指令 `train -h` 查看帮助")


@search_train_info.handle()
async def _(matcher: AlconnaMatcher, parma: Arparma):
train_no: str = parma["train"]
train_date: Optional[str] = parma["date"]

try:
date_obj = parse_date(train_date) if train_date else date.today()
Expand Down Expand Up @@ -85,5 +87,4 @@ async def _(
logger.exception("Failed to render train info")
await matcher.finish("渲染图片时出现错误,请检查后台输出")

await UniMessage(Image(raw=img_bytes)).send(reply_to=True)
await matcher.finish()
await matcher.finish(UniMessage.image(raw=img_bytes))

0 comments on commit d21bf0d

Please sign in to comment.