koleo-cli 0.2.137.20__py3-none-any.whl → 0.2.137.22__py3-none-any.whl

koleo/cli/base.py

@@ -104,3 +104,17 @@ class BaseCli:
     async def get_station_by_id(self, id: int):
         key = f"st-{id}"
         return self.storage.get_cache(key) or self.storage.set_cache(key, await self.client.get_station_by_id(id))
+
+    async def get_brand_by_shortcut(self, s: str, *, name: str | None = None):
+        brands = await self.get_brands()
+        s = s.upper()
+        if name and "SŁONECZNY" in name and s == "KM":
+            return "SLONECZNY" # OH MY FUCKING GOD
+        if s == "AR":
+            return "ARRIVARP"
+        if s not in [i["name"] for i in brands]:
+            res = {i["logo_text"]: i["name"] for i in brands}.get(s)
+            if not res:
+                await self.error_and_exit(f"Invalid brand name not found: [underline]{s},[/underline]")
+            return res
+        return s

koleo/cli/train_info.py

@@ -8,7 +8,7 @@ from koleo.utils import koleo_time_to_dt
 
 class TrainInfo(BaseCli):
     async def get_train_calendars(self, brand: str, name: str) -> list[TrainCalendar]:
-        brand = brand.upper().strip()
+        brand = await self.get_brand_by_shortcut(brand, name=name)
         name_parts = name.split(" ")
         if len(name_parts) == 1 and name_parts[0].isnumeric():
             number = int(name_parts[0])
@@ -18,12 +18,7 @@ class TrainInfo(BaseCli):
             train_name = " ".join(name_parts)
         else:
             raise ValueError("Invalid train name!")
-        brands = await self.get_brands()
-        if brand not in [i["name"] for i in brands]:
-            res = {i["logo_text"]: i["name"] for i in brands}.get(brand)
-            if not res:
-                raise ValueError("Invalid brand name!")
-            brand = res
+
         cache_id = f"tc-{brand}-{number}-{name}"
         try:
             train_calendars = self.storage.get_cache(cache_id) or self.storage.set_cache(
@@ -38,7 +33,7 @@ class TrainInfo(BaseCli):
         brands = await self.get_brands()
         for calendar in train_calendars:
             brand_obj = next(iter(i for i in brands if i["id"] == calendar["trainBrand"]), {})
-            link = f"https://koleo.pl/pociag/{brand_obj["name"]}/{name.replace(" ", "-")}"
+            link = f"https://koleo.pl/pociag/{brand_obj["name"]}/{name.replace(" ", "-", 1).replace(" ", "%20")}"
             brand = brand_obj.get("logo_text", "")
             self.print(
                 f"[red][link={link}]{brand}[/red] [bold blue]{calendar['train_nr']}{" "+ v if (v:=calendar.get("train_name")) else ""}[/bold blue]:[/link]"
@@ -98,9 +93,10 @@ class TrainInfo(BaseCli):
         brands = await self.get_brands()
         brand_obj = next(iter(i for i in brands if i["id"] == train_details["train"]["brand_id"]), {})
         brand = brand_obj.get("logo_text", "")
+        url_brand = await self.get_brand_by_shortcut(brand, name=train_details["train"]["train_full_name"])
 
         link = (
-            f"https://koleo.pl/pociag/{brand_obj["name"]}/{train_details["train"]["train_full_name"].replace(" ", "-")}"
+            f"https://koleo.pl/pociag/{url_brand}/{train_details["train"]["train_full_name"].replace(" ", "-", 1).replace(" ", "%20")}"
         )
         if date:
             link += f"/{date}"

{koleo_cli-0.2.137.20.dist-info → koleo_cli-0.2.137.22.dist-info}/METADATA

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

{koleo_cli-0.2.137.20.dist-info → koleo_cli-0.2.137.22.dist-info}/RECORD

@@ -11,16 +11,16 @@ koleo/api/logging.py,sha256=VhOFY6N_mofFfg9ZJ5ZnDVCzNuRilqLqrzZU9b-hpZY,1644
 koleo/api/types.py,sha256=udCQeDjRvUqrUkuE_-Jidzsq_FOCjNyGd_bQWm3f9iA,10594
 koleo/cli/__init__.py,sha256=50B_lMtZS27_FVrkIa2TOWMX7SozG1CPPMxbY1W9tqk,266
 koleo/cli/aliases.py,sha256=is3NX5g0-ujJTmyjlFLoNnK_pwoYUVIojWNkgwXRBKk,581
-koleo/cli/base.py,sha256=HOEve9aNsL_CcqaKjDFwt1mVDG6J15kY01DpWDV-jL4,4366
+koleo/cli/base.py,sha256=4vnQ4HS5GD6WXReWiJs1E7Bt8cDU4anlZCDb8xXqXS0,4954
 koleo/cli/connections.py,sha256=LJzoq3ADVUmBeqF4-h_me3pZbBHYg1sG3MaDYprwuLU,6873
 koleo/cli/seats.py,sha256=h7pRWdeQ8frHD1ZuiGZO6UGQRboty9PtiVHg49lkw4Q,6337
 koleo/cli/station_board.py,sha256=lRGIeEKEOvUcctM6cwmqVE7Yk9m9R12gfFZahlWLQFc,3669
 koleo/cli/stations.py,sha256=6L3PBWc6xssyR9eeLacuvGBJmaY7Ny3DalKy2Xq7zsA,1633
-koleo/cli/train_info.py,sha256=XS_G4dsevHBPuGSpsbNTh_adSLyedame7WVe71oIe5M,7259
+koleo/cli/train_info.py,sha256=wWsbbvpNmm54_0FBvr_TEhhplhD8byKKYs_VvfpvOcs,7164
 koleo/cli/utils.py,sha256=FzPGcJdwRwcz10mYiW63Y4zpjM9j6DzNH91UNR3MS8s,666
-koleo_cli-0.2.137.20.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-koleo_cli-0.2.137.20.dist-info/METADATA,sha256=kLBn-foH2sAXe1fBqDG3TsTu10ZjbgS1QlKiV99zKG4,4731
-koleo_cli-0.2.137.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-koleo_cli-0.2.137.20.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
-koleo_cli-0.2.137.20.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
-koleo_cli-0.2.137.20.dist-info/RECORD,,
+koleo_cli-0.2.137.22.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+koleo_cli-0.2.137.22.dist-info/METADATA,sha256=QQehYoUOPqA7BiVk7szVD7ZtBZ7vKqoWF0ClMndHITU,4731
+koleo_cli-0.2.137.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+koleo_cli-0.2.137.22.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
+koleo_cli-0.2.137.22.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
+koleo_cli-0.2.137.22.dist-info/RECORD,,