nonebot-plugin-cnrail 0.2.1__tar.gz → 0.2.2.dev1__tar.gz

{nonebot_plugin_cnrail-0.2.1 → nonebot_plugin_cnrail-0.2.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-cnrail
-Version: 0.2.1
+Version: 0.2.2.dev1
 Summary: NoneBot2 plugin for query the train time table
 Home-page: https://github.com/lgc-NB2Dev/nonebot-plugin-cnrail
 Author-Email: student_2333 <lgc2333@126.com>, XieXiLin <support@xiexilin.com>

{nonebot_plugin_cnrail-0.2.1 → nonebot_plugin_cnrail-0.2.2.dev1}/nonebot_plugin_cnrail/__init__.py

@@ -6,7 +6,7 @@ require("nonebot_plugin_htmlrender")
 from . import __main__ as __main__  # noqa: E402
 from .config import ConfigModel  # noqa: E402
 
-__version__ = "0.2.1"
+__version__ = "0.2.2.dev1"
 __plugin_meta__ = PluginMetadata(
     name="CNRail",
     description="查询 12306 列车时刻表",

{nonebot_plugin_cnrail-0.2.1 → nonebot_plugin_cnrail-0.2.2.dev1}/nonebot_plugin_cnrail/models.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 from typing import List, Optional, Union
-
+from nonebot.log import logger
 import pytz
 from pydantic import BaseModel, Field
 
@@ -90,26 +90,23 @@ class TrainDetailData(BaseModel):
     routing: TrainDetailRouing
 
     def arrived(self, station_index: int, train_date: str) -> bool:  # 有待修改
-        # logger.debug(f"index: {station_index}, date: {train_date}")
-        # station = self.via_stations[station_index]
-        # arrive_time_str = (
-        #     station.arrival_time
-        #     if station.arrival_time is not None
-        #     else station.departure_time
-        # )
-        # arrive_datetime = (
-        #     datetime.fromisoformat(
-        #         f"{train_date}T{arrive_time_str}",
-        #     )
-        #     + timedelta(days=station.day_index)
-        # ).replace(tzinfo=TZ_SHANGHAI)
-        # if (arrive_datetime.month + 12 * (arrive_datetime.year - datetime.today().year)) > 3:
-        #     arrive_datetime = arrive_datetime.replace(year=arrive_datetime.year - 1)
-        # logger.debug(
-        #     f"arrive: {arrive_time_str}, arrive_datetime: {arrive_datetime}, now: {datetime.now(TZ_SHANGHAI)}, bool: {datetime.now(TZ_SHANGHAI) >= arrive_datetime}",
-        # )
-        # return datetime.now(TZ_SHANGHAI) >= arrive_datetime
-        return False
+        logger.debug(f"index: {station_index}, date: {train_date}")
+        station = self.via_stations[station_index]
+        arrive_time_str = (
+            station.arrival_time
+            if station.arrival_time is not None
+            else station.departure_time
+        )
+        arrive_datetime = (
+            datetime.fromisoformat(
+                f"{train_date}T{arrive_time_str}",
+            )
+            + timedelta(days=station.day_index)
+        ).replace(tzinfo=TZ_SHANGHAI)
+        logger.debug(
+            f"arrive: {arrive_time_str}, arrive_datetime: {arrive_datetime}, now: {datetime.now(TZ_SHANGHAI)}, bool: {datetime.now(TZ_SHANGHAI) >= arrive_datetime}",
+        )
+        return datetime.now(TZ_SHANGHAI) >= arrive_datetime
 
 
 class TrainSNData(BaseModel):

{nonebot_plugin_cnrail-0.2.1 → nonebot_plugin_cnrail-0.2.2.dev1}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
 ]
 requires-python = ">=3.9,<4.0"
 readme = "README.md"
-version = "0.2.1"
+version = "0.2.2.dev1"
 
 [project.license]
 text = "MIT"