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

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

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

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

@@ -96,14 +96,16 @@ class CLI:
         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)
+            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)
+            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()
+            key=lambda train: datetime.fromisoformat(
+                train[0]["departure"] if train[1] == 1 else train[0]["arrival"]
+            ).timestamp(),
         )
         trains = [
             (i, type)
@@ -113,7 +115,11 @@ class CLI:
         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]"
+            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]"
@@ -164,14 +170,16 @@ class CLI:
         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]:"]
+            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"))):
+        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)
@@ -182,7 +190,8 @@ class CLI:
         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"]}")
+        if train_details["train"]["run_desc"]:
+            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"])
@@ -241,11 +250,8 @@ class CLI:
             dep = arr_dep_to_dt(i["departure"])
             travel_time = (arr - dep).seconds
             parts.append(
-                f"[bold green][link=https://koleo.pl/travel-options/{i["id"]}]{dep.strftime("%H:%M")} - {arr.strftime("%H:%M")}[/bold green] {travel_time//3600}h{(travel_time % 3600)/60:.0f}m {i['distance']}km: [/link]"
+                f"[bold green][link=https://koleo.pl/travel-options/{i["id"]}]{dep.strftime("%H:%M")} - {arr.strftime("%H:%M")}[/bold green] {travel_time//3600}h{(travel_time % 3600)/60:.0f}m {i['distance']}km:[/link]"
             )
-            if i["constriction_info"]:
-                for constriction in i["constriction_info"]:
-                    parts.append(f" [bold red]- {constriction} [/bold red]")
             if len(i["trains"]) == 1:
                 train = i["trains"][0]
                 stop = next(iter(i for i in train["stops"] if i["station_id"] == train["start_station_id"]), {})
@@ -258,10 +264,15 @@ class CLI:
                     )
                 )
                 brand = next(iter(i for i in api_brands if i["id"] == train["brand_id"]), {}).get("logo_text")
+                s = f" [red]{brand}[/red] {train["train_full_name"]}[purple] {stop_station['name']} {self.format_position(stop["platform"], stop["track"])}[/purple]"
                 parts[-1] += (
                     f" [red]{brand}[/red] {train["train_full_name"]}[purple] {stop_station['name']} {self.format_position(stop["platform"], stop["track"])}[/purple]"
                 )
+                for constriction in i["constriction_info"]:
+                    parts.append(f" [bold red]- {constriction}[/bold red]")
             else:
+                for constriction in i["constriction_info"]:
+                    parts.append(f" [bold red]- {constriction}[/bold red]")
                 previous_arrival: datetime | None = None
                 for train in i["trains"]:
                     brand = next(iter(i for i in api_brands if i["id"] == train["brand_id"]), {}).get("logo_text")

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

@@ -81,4 +81,4 @@ class Storage:
         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
+            self._dirty = True

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

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

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

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