koleo-cli 0.2.137.8__tar.gz → 0.2.137.10__tar.gz

{koleo_cli-0.2.137.8/koleo_cli.egg-info → koleo_cli-0.2.137.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: koleo-cli
-Version: 0.2.137.8
+Version: 0.2.137.10
 Summary: Koleo CLI
 Home-page: https://github.com/lzgirlcat/koleo-cli
 Author: Zoey !

{koleo_cli-0.2.137.8 → koleo_cli-0.2.137.10}/koleo/cli.py

@@ -6,7 +6,7 @@ from rich.console import Console
 
 from .api import KoleoAPI
 from .storage import DEFAULT_CONFIG_PATH, Storage
-from .types import ExtendedBaseStationInfo, TrainDetailResponse, TrainOnStationInfo
+from .types import ExtendedBaseStationInfo, TrainDetailResponse, TrainOnStationInfo, TrainCalendar
 from .utils import RemainderString, arr_dep_to_dt, convert_platform_number, name_to_slug, parse_datetime
 
 
@@ -89,6 +89,37 @@ class CLI:
         self.print(station_info)
         self.get_arrivals(st["id"], date)
 
+    def all_trains(self, station: str, date: datetime):
+        st = self.get_station(station)
+        station_info = f"[bold blue][link=https://koleo.pl/dworzec-pkp/{st["name_slug"]}/{date.strftime("%Y-%m-%d")}]{st["name"]} at {date.strftime("%d-%m %H:%M")}[/bold blue] ID: {st["id"]}[/link]"
+        self.print(station_info)
+        arr_cache_id = f"arr-{st['id']}-{date.strftime("%Y-%m-%d")}"
+        dep_cache_id = f"dep-{st['id']}-{date.strftime("%Y-%m-%d")}"
+        arrivals = self.storage.get_cache(arr_cache_id) or self.storage.set_cache(
+            arr_cache_id, self.client.get_arrivals(st['id'], date)
+        )
+        departures = self.storage.get_cache(dep_cache_id) or self.storage.set_cache(
+            dep_cache_id, self.client.get_departures(st['id'], date)
+        )
+        trains = sorted(
+            [(i, 1) for i in departures] + [(i, 2) for i in arrivals],
+            key=lambda train: datetime.fromisoformat(train[0]["departure"] if train[1] == 1 else train[0]["arrival"]).timestamp()
+        )
+        trains = [
+            (i, type)
+            for i, type in trains
+            if datetime.fromisoformat(i["departure"] if type == 1 else i["arrival"]).timestamp() > date.timestamp()  # type: ignore
+        ]
+        brands = self.storage.get_cache("brands") or self.storage.set_cache("brands", self.client.get_brands())
+        parts = []
+        for train, type in trains:
+            time = f"[bold green]{train['departure'][11:16]}[/bold green]" if type == 1 else f"[bold yellow]{train['arrival'][11:16]}[/bold yellow]"
+            brand = next(iter(i for i in brands if i["id"] == train["brand_id"]), {}).get("logo_text")
+            parts.append(
+                f"{time} [red]{brand}[/red] {train["train_full_name"]}[purple] {train["stations"][0]["name"]} {self.format_position(train["platform"], train["track"])}[/purple]"
+            )
+        self.print("\n".join(parts))
+
     def find_station(self, query: str | None):
         if query:
             stations = self.client.find_station(query)
@@ -101,7 +132,7 @@ class CLI:
                 f"[bold blue][link=https://koleo.pl/dworzec-pkp/{st["name_slug"]}]{st["name"]}[/bold blue] ID: {st["id"]}[/link]"
             )
 
-    def train_info(self, brand: str, name: str, date: datetime):
+    def get_train_calendars(self, brand: str, name: str) -> list[TrainCalendar]:
         brand = brand.upper().strip()
         name_parts = name.split(" ")
         if len(name_parts) == 1 and name_parts[0].isnumeric():
@@ -126,21 +157,47 @@ class CLI:
         except self.client.errors.KoleoNotFound:
             self.print(f'[bold red]Train not found: nr={number}, name="{train_name}"[/bold red]')
             exit(2)
-        train_id = train_calendars["train_calendars"][0]["date_train_map"][date.strftime("%Y-%m-%d")]
+        return train_calendars["train_calendars"]
+
+    def train_calendar(self, brand: str, name: str):
+        train_calendars = self.get_train_calendars(brand, name)
+        brands = self.storage.get_cache("brands") or self.storage.set_cache("brands", self.client.get_brands())
+        for calendar in train_calendars:
+            brand = next(iter(i for i in brands if i["id"] == calendar["trainBrand"]), {}).get("logo_text", "")
+            parts = [f"[red]{brand}[/red] [bold blue]{calendar['train_nr']}{" "+ v if (v:=calendar.get("train_name")) else ""}[/bold blue]:"]
+            for k, v in calendar["date_train_map"].items():
+                parts.append(f"  [bold green]{k}[/bold green]: [purple]{v}[/purple]")
+            self.print("\n".join(parts))
+
+    def train_info(self, brand: str, name: str, date: datetime):
+        train_calendars = self.get_train_calendars(brand, name)
+        if not (train_id:=train_calendars[0]["date_train_map"].get(date.strftime("%Y-%m-%d"))):
+            self.print(f"[bold red]This train doesn't run on the selected date: {date.strftime("%Y-%m-%d")}[/bold red]")
+            exit(2)
+        self.train_detail(train_id)
+
+    def train_detail(self, train_id: int):
         train_details = self.client.get_train(train_id)
+        brands = self.storage.get_cache("brands") or self.storage.set_cache("brands", self.client.get_brands())
         brand = next(iter(i for i in brands if i["id"] == train_details["train"]["brand_id"]), {}).get("logo_text", "")
+
         parts = [f"[red]{brand}[/red] [bold blue]{train_details["train"]["train_full_name"]}[/bold blue]"]
+        parts.append(f"  {train_details["train"]["run_desc"]}")
+
         route_start = arr_dep_to_dt(train_details["stops"][0]["departure"])
         route_end = arr_dep_to_dt(train_details["stops"][-1]["arrival"])
+
         if route_end.hour < route_start.hour or (
             route_end.hour == route_start.hour and route_end.minute < route_end.minute
         ):
             route_end += timedelta(days=1)
+
         travel_time = route_end - route_start
         speed = train_details["stops"][-1]["distance"] / 1000 / travel_time.seconds * 3600
         parts.append(
             f"[white]  {travel_time.seconds//3600}h{(travel_time.seconds % 3600)/60:.0f}m {speed:^4.1f}km/h [/white]"
         )
+
         vehicle_types: dict[str, str] = {
             stop["station_display_name"]: stop["vehicle_type"]
             for stop in train_details["stops"]
@@ -330,10 +387,30 @@ def main():
     arrivals.add_argument("-s", "--save", help="save the station as your default one", action="store_true")
     arrivals.set_defaults(func=cli.full_arrivals, pass_=["station", "date"])
 
+    all_trains = subparsers.add_parser(
+        "all", aliases=["w", "wszystkie", "all_trains", "pociagi"], help="Allows you to list all station trains"
+    )
+    all_trains.add_argument(
+        "station",
+        help="The station name",
+        default=None,
+        nargs="*",
+        action=RemainderString,
+    )
+    all_trains.add_argument(
+        "-d",
+        "--date",
+        help="the date",
+        type=lambda s: parse_datetime(s),
+        default=datetime.now(),
+    )
+    all_trains.add_argument("-s", "--save", help="save the station as your default one", action="store_true")
+    all_trains.set_defaults(func=cli.all_trains, pass_=["station", "date"])
+
     train_route = subparsers.add_parser(
         "trainroute",
         aliases=["r", "tr", "t", "poc", "pociąg"],
-        help="Allows you to show the train's route",
+        help="Allows you to check the train's route",
     )
     train_route.add_argument("brand", help="The brand name", type=str)
     train_route.add_argument("name", help="The train name", nargs="+", action=RemainderString)
@@ -346,6 +423,23 @@ def main():
     )
     train_route.set_defaults(func=cli.train_info, pass_=["brand", "name", "date"])
 
+    train_calendar = subparsers.add_parser(
+        "traincalendar",
+        aliases=["kursowanie", "tc", "k"],
+        help="Allows you to check what days the train runs on",
+    )
+    train_calendar.add_argument("brand", help="The brand name", type=str)
+    train_calendar.add_argument("name", help="The train name", nargs="+", action=RemainderString)
+    train_calendar.set_defaults(func=cli.train_calendar, pass_=["brand", "name"])
+
+    train_detail = subparsers.add_parser(
+        "traindetail",
+        aliases=["td", "tid", "id", "idpoc"],
+        help="Allows you to show the train's route given it's koleo ID",
+    )
+    train_detail.add_argument("train_id", help="The koleo ID", type=int)
+    train_detail.set_defaults(func=cli.train_detail, pass_=["train_id"])
+
     stations = subparsers.add_parser(
         "stations", aliases=["s", "find", "f", "stacje", "ls", "q"], help="Allows you to find stations by their name"
     )
@@ -402,7 +496,6 @@ def main():
         args.station = storage.favourite_station
     elif hasattr(args, "station") and args.save:
         storage.favourite_station = args.station
-        storage.save()
     if not hasattr(args, "func"):
         if storage.favourite_station:
             cli.full_departures(storage.favourite_station, datetime.now())
@@ -411,3 +504,6 @@ def main():
             exit()
     else:
         args.func(**{k: v for k, v in args.__dict__.items() if k in getattr(args, "pass_", [])})
+
+    if storage._dirty:
+        storage.save()

{koleo_cli-0.2.137.8 → koleo_cli-0.2.137.10}/koleo/storage.py

@@ -33,6 +33,7 @@ class Storage:
 
     def __post_init__(self):
         self._path: str
+        self._dirty = False
 
     @classmethod
     def load(cls, *, path: str = DEFAULT_CONFIG_PATH) -> t.Self:
@@ -57,13 +58,13 @@ class Storage:
             return item
         else:
             self.cache.pop(id)
-            self.save()
+            self._dirty = True
 
     def set_cache(self, id: str, item: T, ttl: int = 86400) -> T:
         if self.disable_cache:
             return item
         self.cache[id] = (int(time() + ttl), item)
-        self.save()
+        self._dirty = True
         return item
 
     def save(self):
@@ -72,4 +73,12 @@ class Storage:
             if not ospath.exists(dir):
                 makedirs(dir)
         with open(self._path, "w+") as f:
+            self.clean()
             dump(asdict(self), f, indent=True)
+
+    def clean(self):
+        now = time()
+        copy = self.cache.copy()
+        self.cache = {k: data for k, data in copy.items() if data[0] > now}
+        if copy != self.cache:
+            self._dirty = True

{koleo_cli-0.2.137.8 → koleo_cli-0.2.137.10/koleo_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: koleo-cli
-Version: 0.2.137.8
+Version: 0.2.137.10
 Summary: Koleo CLI
 Home-page: https://github.com/lzgirlcat/koleo-cli
 Author: Zoey !

{koleo_cli-0.2.137.8 → koleo_cli-0.2.137.10}/setup.py

@@ -14,7 +14,7 @@ def parse_requirements_file(path):
 
 setuptools.setup(
     name="koleo-cli",
-    version="0.2.137.8",
+    version="0.2.137.10",
     description="Koleo CLI",
     long_description=long_description(),
     long_description_content_type="text/markdown",