koleo-cli 0.2.137.20__tar.gz → 0.2.137.22__tar.gz

{koleo_cli-0.2.137.20/koleo_cli.egg-info → koleo_cli-0.2.137.22}/PKG-INFO

@@ -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 → koleo_cli-0.2.137.22}/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-0.2.137.20 → koleo_cli-0.2.137.22}/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 → koleo_cli-0.2.137.22/koleo_cli.egg-info}/PKG-INFO

@@ -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 → koleo_cli-0.2.137.22}/setup.py

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