koleo-cli 0.2.137.11__tar.gz → 0.2.137.13__tar.gz

{koleo_cli-0.2.137.11/koleo_cli.egg-info → koleo_cli-0.2.137.13}/PKG-INFO

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

{koleo_cli-0.2.137.11 → koleo_cli-0.2.137.13}/koleo/api.py

@@ -136,7 +136,7 @@ class KoleoAPI:
             "query[date]": date.strftime("%d-%m-%Y %H:%M:%S"),
             "query[start_station]": start,
             "query[end_station]": end,
-            "query[only_purchasable]": str(direct).lower(),
+            "query[only_purchasable]": str(purchasable).lower(),
             "query[only_direct]": str(direct).lower(),
             "query[brand_ids][]": brand_ids,
         }

{koleo_cli-0.2.137.11 → koleo_cli-0.2.137.13}/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"])
@@ -214,34 +223,57 @@ class CLI:
         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, purchasable: bool):
+    def connections(
+        self,
+        start: str,
+        end: str,
+        date: datetime,
+        brands: list[str],
+        direct: bool,
+        purchasable: bool,
+        length: int = 1
+    ):
         start_station = self.get_station(start)
         end_station = self.get_station(end)
         brands = [i.lower().strip() for i in brands]
         api_brands = self.storage.get_cache("brands") or self.storage.set_cache("brands", self.client.get_brands())
         if not brands:
-            connection_brands = [i["id"] for i in api_brands]
+            connection_brands = {i["name"]: i["id"] for i in api_brands}
         else:
-            connection_brands = [
-                i["id"]
+            connection_brands = {
+                i["name"]: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.print(f'[bold red]No brands match: "{', '.join(brands)}"[/bold red]')
                 exit(2)
-        connections = self.client.get_connections(
-            start_station["name_slug"], end_station["name_slug"], connection_brands, date, direct, purchasable
+        results = []
+        fetch_date = date
+        while len(results) < length:
+            connections = self.client.get_connections(
+                start_station["name_slug"], end_station["name_slug"], list(connection_brands.values()), fetch_date, direct, purchasable
+            )
+            if connections:
+                fetch_date = arr_dep_to_dt(connections[-1]["departure"]) + timedelta(seconds=(30*60)+1) # wtf
+                results.extend(connections)
+            else:
+                break
+        link = (
+            f"https://koleo.pl/rozklad-pkp/{start_station["name_slug"]}/{end_station["name_slug"]}"
+            + f"/{date.strftime("%d-%m-%Y_%H:%M")}"
+            +f"{"all" if not direct else "direct"}/{"-".join(connection_brands.keys()) if brands else "all"}"
         )
         parts = [
-            f"[bold blue]{start_station["name"]} → {end_station["name"]} at {date.strftime("%H:%M %d-%m")}[/bold blue]"
+            f"[bold blue][link={link}]{start_station["name"]} → {end_station["name"]} at {date.strftime("%H:%M %d-%m")}[/link][/bold blue]"
         ]
-        for i in connections:
+        for i in results:
             arr = arr_dep_to_dt(i["arrival"])
             dep = arr_dep_to_dt(i["departure"])
             travel_time = (arr - dep).seconds
+            date_part = f"{arr.strftime("%d-%m")} " if arr.date() != date.date() else ""
             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"]}]{date_part}{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 len(i["trains"]) == 1:
                 train = i["trains"][0]
@@ -485,7 +517,14 @@ def main():
         action="store_true",
         default=False,
     )
-    connections.set_defaults(func=cli.connections, pass_=["start", "end", "brands", "date", "direct", "purchasable"])
+    connections.add_argument(
+        "-l",
+        "--length",
+        help="fetch at least n connections",
+        type=int,
+        default=1,
+    )
+    connections.set_defaults(func=cli.connections, pass_=["start", "end", "brands", "date", "direct", "purchasable", "length"])
 
     args = parser.parse_args()
 

{koleo_cli-0.2.137.11 → koleo_cli-0.2.137.13}/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.11 → koleo_cli-0.2.137.13/koleo_cli.egg-info}/PKG-INFO

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

{koleo_cli-0.2.137.11 → koleo_cli-0.2.137.13}/setup.py

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