koleo-cli 0.2.137.2__py3-none-any.whl → 0.2.137.3__py3-none-any.whl

koleo/api.py

@@ -86,7 +86,7 @@ class KoleoAPI:
 
     def find_station(self, query: str, language: str = "pl") -> list[ExtendedStationInfo]:
         # https://koleo.pl/ls?q=tere&language=pl
-        return self._get_json("/ls", query={"q": query, "language": language})
+        return self._get_json("/ls", params={"q": query, "language": language})["stations"]
 
     def get_station_by_slug(self, slug: str) -> ExtendedBaseStationInfo:
         # https://koleo.pl/api/v2/main/stations/by_slug/inowroclaw

koleo/cli.py

@@ -1,3 +1,4 @@
+import re
 from argparse import ArgumentParser
 from datetime import datetime, timedelta
 
@@ -22,7 +23,16 @@ class CLI:
     ) -> None:
         self._client = client
         self._storage = storage
-        self.console = Console(color_system="standard", no_color=no_color)
+        self.no_color = no_color
+        self.console = Console(color_system="standard", no_color=no_color, highlight=False)
+
+    def print(self, text, *args, **kwargs):
+        if self.no_color:
+            result = re.sub(r'\[[^\]]*\]', '', text)
+            print(result)
+        else:
+            self.console.print(text, *args, **kwargs)
+
 
     @property
     def client(self) -> KoleoAPI:
@@ -59,7 +69,7 @@ class CLI:
             if datetime.fromisoformat(i["departure"]).timestamp() > date.timestamp()  # type: ignore
         ]
         table = self.trains_on_station_table(trains)
-        self.console.print(table)
+        self.print(table)
         return table
 
     def get_arrivals(self, station_id: int, date: datetime):
@@ -74,21 +84,32 @@ class CLI:
             if datetime.fromisoformat(i["arrival"]).timestamp() > date.timestamp()  # type: ignore
         ]
         table = self.trains_on_station_table(trains, type=2)
-        self.console.print(table)
+        self.print(table)
         return table
 
     def full_departures(self, station: str, date: datetime):
         st = self.get_station(station)
         station_info = f"[bold blue]{st["name"]}[/bold blue] ID: {st["id"]}"
-        self.console.print(station_info)
+        self.print(station_info)
         self.get_departures(st["id"], date)
 
     def full_arrivals(self, station: str, date: datetime):
         st = self.get_station(station)
         station_info = f"[bold blue]{st["name"]}[/bold blue] ID: {st["id"]}"
-        self.console.print(station_info)
+        self.print(station_info)
         self.get_arrivals(st["id"], date)
 
+    def find_station(self, query: str | None):
+        if query:
+            stations = self.client.find_station(query)
+        else:
+            stations = (
+                self.storage.get_cache("stations") or
+                self.storage.set_cache("stations", self.client.get_stations())
+            )
+        for st in stations:
+            self.print(f"[bold blue]{st["name"]}[/bold blue] ID: {st["id"]}")
+
     def train_info(self, brand: str, name: str, date: datetime):
         brand = brand.upper().strip()
         name = name.strip()
@@ -113,7 +134,7 @@ class CLI:
         train_id = train_calendars["train_calendars"][0]["date_train_map"][date.strftime("%Y-%m-%d")]
         train_details = self.client.get_train(train_id)
         brand = next(iter(i for i in brands if i["id"] == train_details["train"]["brand_id"]), {}).get("logo_text", "")
-        parts = [f"{brand} {train_details["train"]["train_full_name"]}"]
+        parts = [f"[red]{brand}[/red] [bold blue]{train_details["train"]["train_full_name"]}[/bold blue]"]
         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):
@@ -134,8 +155,8 @@ class CLI:
                     parts.append(f"[bold green]  {start} - {keys[i]}:[/bold green] {vehicle_types[start]}")
                     start = keys[i]
             parts.append(f"[bold green]  {start} - {keys[-1]}:[/bold green] {vehicle_types[start]}")
-        self.console.print("\n".join(parts))
-        self.console.print(self.train_route_table(train_details))
+        self.print("\n".join(parts))
+        self.print(self.train_route_table(train_details))
 
     def connections(self, start: str, end: str, date: datetime, brands: list[str], direct: bool = False, purchasable: bool = False):
         start_station = self.get_station(start)
@@ -147,7 +168,7 @@ class CLI:
         else:
             connection_brands = [i["id"] for i in api_brands if i["name"].lower().strip() in brands or i["logo_text"].lower().strip() in brands]
             if not connection_brands:
-                self.console.print(f'[bold red]No brands match: "{', '.join(brands)}"[/bold red]')
+                self.print(f'[bold red]No brands match: "{', '.join(brands)}"[/bold red]')
                 exit(2)
         connections = self.client.get_connections(
             start_station["name_slug"],
@@ -168,7 +189,7 @@ class CLI:
             platform = convert_platform_number(train["platform"]) if train["platform"] else ""
             position_info = f"{platform}/{train["track"]}" if train["track"] else platform
             parts.append(
-                f"[bold green]{time[11:16]}[/bold green] {brand} {train["train_full_name"]}[purple] {train["stations"][0]["name"]} {position_info}[/purple]"
+                f"[bold green]{time[11:16]}[/bold green] [red]{brand}[/red] {train["train_full_name"]}[purple] {train["stations"][0]["name"]} {position_info}[/purple]"
             )
         return "\n".join(parts)
 
@@ -190,7 +211,7 @@ class CLI:
                 f"st-{slug}", self.client.get_station_by_slug(slug)
             )
         except self.client.errors.KoleoNotFound:
-            self.console.print(f'[bold red]Station not found: "{station}"[/bold red]')
+            self.print(f'[bold red]Station not found: "{station}"[/bold red]')
             exit(2)
 
 def main():
@@ -251,9 +272,18 @@ def main():
     )
     train_route.set_defaults(func=cli.train_info, pass_=["brand", "name", "date"])
 
+    stations = subparsers.add_parser("stations", aliases=["s", "find", "f", "stacje"], help="Allows you to find stations by their name")
+    stations.add_argument(
+        "query",
+        help="The station name",
+        default=None,
+        nargs="?",
+    )
+    stations.set_defaults(func=cli.find_station, pass_=["query"])
+
     connections = subparsers.add_parser(
         "connections",
-        aliases=["do", "z", "szukaj", "path", "find"],
+        aliases=["do", "z", "szukaj", "path"],
         help="Allows you to search for connections from a to b",
     )
     connections.add_argument("start", help="The starting station", type=str)
@@ -291,6 +321,7 @@ def main():
     client = KoleoAPI()
     cli.client, cli.storage = client, storage
     cli.console.no_color = args.nocolor
+    cli.no_color = args.nocolor
     if hasattr(args, "station") and args.station is None:
         args.station = storage.favourite_station
     elif hasattr(args, "station") and args.save:

{koleo_cli-0.2.137.2.dist-info → koleo_cli-0.2.137.3.dist-info}/METADATA

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

koleo_cli-0.2.137.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+koleo/__init__.py,sha256=N_IkOBZCSPCCw31Hu72CFys707PziGFmXpNVl0CXAz8,47
+koleo/__main__.py,sha256=wu5N2wk8mvBgyvr2ghmQf4prezAe0_i-p123VVreyYc,62
+koleo/api.py,sha256=L4Nqcf2dj5IRNijxJ1IeJCf-69o_3FSjvJzLDi1f8s4,5435
+koleo/cli.py,sha256=DAHe1Kqzkg0EGK00kkErBugtz-sdA8FNMpvdeAQoRvM,13767
+koleo/storage.py,sha256=l48A8zsP3t77nFZA23dDncoeyV_VlhJ1RvM3xjWug2Q,2001
+koleo/types.py,sha256=n7eXJfWD9BbCY6pwhPZhrArZsCqNSnGra2-ZSYwxJ58,3916
+koleo/utils.py,sha256=N9ceKXsxC4RrG_W2PJopSL8Dsj44rFs2rDkyzM4m4ek,1428
+koleo_cli-0.2.137.3.dist-info/METADATA,sha256=ONp3qsmOfzWqnTrgWcCGYIZHvuhwvo9l5tdUwrYO4lA,626
+koleo_cli-0.2.137.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+koleo_cli-0.2.137.3.dist-info/entry_points.txt,sha256=LtCidkVDq8Zd7-fxpRbys1Xa9LTHMZwXVbdcQEscdes,41
+koleo_cli-0.2.137.3.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
+koleo_cli-0.2.137.3.dist-info/RECORD,,

koleo_cli-0.2.137.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-koleo/__init__.py,sha256=N_IkOBZCSPCCw31Hu72CFys707PziGFmXpNVl0CXAz8,47
-koleo/__main__.py,sha256=wu5N2wk8mvBgyvr2ghmQf4prezAe0_i-p123VVreyYc,62
-koleo/api.py,sha256=4qMx7pyfX_DR830BzfzwfWnmuiRQyvvWO42KwAl8Lqo,5422
-koleo/cli.py,sha256=raS5fkz42YY3gVJXpoExid1Dkc99vmM-hPgTvHsUZGM,12742
-koleo/storage.py,sha256=l48A8zsP3t77nFZA23dDncoeyV_VlhJ1RvM3xjWug2Q,2001
-koleo/types.py,sha256=n7eXJfWD9BbCY6pwhPZhrArZsCqNSnGra2-ZSYwxJ58,3916
-koleo/utils.py,sha256=N9ceKXsxC4RrG_W2PJopSL8Dsj44rFs2rDkyzM4m4ek,1428
-koleo_cli-0.2.137.2.dist-info/METADATA,sha256=f980X6ifdRtYmDoq6-8lHz_Quz7pm4RZUlOI66OKVKw,626
-koleo_cli-0.2.137.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-koleo_cli-0.2.137.2.dist-info/entry_points.txt,sha256=LtCidkVDq8Zd7-fxpRbys1Xa9LTHMZwXVbdcQEscdes,41
-koleo_cli-0.2.137.2.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
-koleo_cli-0.2.137.2.dist-info/RECORD,,