koleo-cli 0.2.137.4__py3-none-any.whl → 0.2.137.5__py3-none-any.whl

koleo/cli.py

@@ -106,15 +106,14 @@ class CLI:
         for st in stations:
             self.print(f"[bold blue][link=https://koleo.pl/dworzec-pkp/{st["name_slug"]}]{st["name"]}[/bold blue] ID: {st["id"]}[/link]")
 
-    def train_info(self, brand: str, name: str, date: datetime):
+    def train_info(self, brand: str, name: list[str], date: datetime):
         brand = brand.upper().strip()
-        name = name.strip()
-        if name.isnumeric():
-            number = int(name)
+        if len(name) == 1 and name[0].isnumeric():
+            number = int(name[0])
             train_name = ""
-        elif len((parts := name.split(" "))) == 2 or len((parts := name.split("-"))) == 2:
-            number, train_name = parts
-            number = int(number)
+        elif len(name) > 1:
+            number = int(name.pop(0))
+            train_name = " ".join(name)
         else:
             raise ValueError("Invalid train name!")
         brands = self.storage.get_cache("brands") or self.storage.set_cache("brands", self.client.get_brands())
@@ -124,9 +123,13 @@ class CLI:
                 raise ValueError("Invalid brand name!")
             brand = res
         cache_id = f"tc-{brand}-{number}-{name}"
-        train_calendars = self.storage.get_cache(cache_id) or self.storage.set_cache(
-            cache_id, self.client.get_train_calendars(brand, number, train_name)
-        )
+        try:
+            train_calendars = self.storage.get_cache(cache_id) or self.storage.set_cache(
+                cache_id, self.client.get_train_calendars(brand, number, train_name)
+            )
+        except self.client.errors.KoleoNotFound:
+            self.print(f'[bold red]Train not found: nr={number}, name="{train_name}"[/bold red]')
+            exit(2)
         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", "")
@@ -311,7 +314,7 @@ def main():
         help="Allows you to show the train's route",
     )
     train_route.add_argument("brand", help="The brand name", type=str)
-    train_route.add_argument("name", help="The train name", type=str)
+    train_route.add_argument("name", help="The train name", type=str, nargs="+")
     train_route.add_argument(
         "-d",
         "--date",

{koleo_cli-0.2.137.4.dist-info → koleo_cli-0.2.137.5.dist-info}/METADATA

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

{koleo_cli-0.2.137.4.dist-info → koleo_cli-0.2.137.5.dist-info}/RECORD

@@ -1,12 +1,12 @@
 koleo/__init__.py,sha256=N_IkOBZCSPCCw31Hu72CFys707PziGFmXpNVl0CXAz8,47
 koleo/__main__.py,sha256=wu5N2wk8mvBgyvr2ghmQf4prezAe0_i-p123VVreyYc,62
 koleo/api.py,sha256=3pVcAMnCzaDIgakxagmKOZpph8JU5p6agXKGw550rkw,5710
-koleo/cli.py,sha256=o_6tUy8odM-CqSqpEJMJFTGx1QJnPwu-kIXzrjH5VpI,18098
+koleo/cli.py,sha256=pnKtWnD7DPre5tVQJ9Okp3_OWqaRDPCL7hh3SVxo9bg,18247
 koleo/storage.py,sha256=l48A8zsP3t77nFZA23dDncoeyV_VlhJ1RvM3xjWug2Q,2001
 koleo/types.py,sha256=PQDDaTF9Q6ZylcOupWrOWg0qWMqRrNhMOE5m_bl8fVo,5219
 koleo/utils.py,sha256=ejJpHnFYDPbxa3Wd_q92cTkwbkXhGvwFGKoGITBSrdY,1615
-koleo_cli-0.2.137.4.dist-info/METADATA,sha256=rBTsWkw7oG5GU5kjGtZktysGFC9smmvohueArb-YE8w,626
-koleo_cli-0.2.137.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-koleo_cli-0.2.137.4.dist-info/entry_points.txt,sha256=LtCidkVDq8Zd7-fxpRbys1Xa9LTHMZwXVbdcQEscdes,41
-koleo_cli-0.2.137.4.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
-koleo_cli-0.2.137.4.dist-info/RECORD,,
+koleo_cli-0.2.137.5.dist-info/METADATA,sha256=9lGPhSlMhq-6eFzafIu_CH2LF1jOVyhbgb5yDWdM7O4,626
+koleo_cli-0.2.137.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+koleo_cli-0.2.137.5.dist-info/entry_points.txt,sha256=LtCidkVDq8Zd7-fxpRbys1Xa9LTHMZwXVbdcQEscdes,41
+koleo_cli-0.2.137.5.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
+koleo_cli-0.2.137.5.dist-info/RECORD,,