koleo-cli 0.2.137.23__py3-none-any.whl → 0.2.137.23.3__py3-none-any.whl

koleo/args.py

@@ -280,12 +280,14 @@ def main():
     async def run_view(func, *args, **kwargs):
         res = func(*args, **kwargs)
         if isawaitable(res):
-            await res
+            try:
+                await res
+            except SystemExit:
+                ...
         await client.close()
 
     cli.client, cli.storage = client, storage
-    cli.console.no_color = args.nocolor
-    cli.no_color = args.nocolor
+    cli.init_console(args.nocolor)
     if hasattr(args, "station") and args.station is None:
         args.station = storage.favourite_station
     elif hasattr(args, "station") and getattr(args, "save", False):

koleo/cli/__init__.py

@@ -3,7 +3,6 @@ from .connections import Connections
 from .seats import Seats
 from .station_board import StationBoard
 from .stations import Stations
-from .train_info import TrainInfo
 
 
 class CLI(Aliases, StationBoard, Connections, Seats, Stations): ...

koleo/cli/base.py

@@ -1,7 +1,5 @@
 import re
 
-from rich.console import Console
-
 from koleo.api import KoleoAPI
 from koleo.api.types import ExtendedStationInfo, TrainOnStationInfo, TrainStop
 from koleo.storage import Storage
@@ -18,7 +16,13 @@ class BaseCli:
         self._client = client
         self._storage = storage
         self.no_color = no_color
-        self.console = Console(color_system="standard", no_color=no_color, highlight=False)
+
+    def init_console(self, no_color: bool | None = None):
+        if no_color is not None:
+            self.no_color = no_color
+        if not self.no_color:
+            from rich.console import Console
+            self.console = Console(color_system="standard", highlight=False)
 
     def print(self, text: str, *args, **kwargs):
         if not text.strip():

koleo/cli/connections.py

@@ -76,7 +76,7 @@ class Connections(BaseCli):
             else:
                 price_str = ""
             parts.append(
-                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{price_str}:[/link]"
+                f"[bold green][link=https://koleo.pl/p/{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{price_str}:[/link]"
             )
             if len(i["trains"]) == 1:
                 train = i["trains"][0]

koleo/cli/train_info.py

@@ -14,7 +14,7 @@ class TrainInfo(BaseCli):
         if len(name_parts) == 1 and name_parts[0].isnumeric():
             number = int(name_parts[0])
             train_name = ""
-        elif len(name) > 1:
+        elif len(name_parts) > 1:
             number = int(name_parts.pop(0))
             train_name = " ".join(name_parts)
         else:

koleo/storage.py

@@ -91,7 +91,7 @@ class Storage:
     def load(cls, *, path: str = DEFAULT_CONFIG_PATH, ignore_cache: bool = False) -> t.Self:
         expanded = ospath.expanduser(path)
         if ospath.exists(expanded):
-            with open(expanded) as f:
+            with open(expanded, "rb") as f:
                 data = {k: v for k, v in loads(f.read()).items() if k in cls.__dataclass_fields__}
         else:
             data = {}

koleo/utils.py

@@ -1,7 +1,7 @@
 from argparse import Action
 from datetime import datetime, time, timedelta
 
-from .api.types import CarriageType, SeatsAvailabilityResponse, TimeDict, TrainComposition
+from .api.types import SeatsAvailabilityResponse, TimeDict, TrainComposition
 
 
 def parse_datetime(s: str):
@@ -69,6 +69,7 @@ TRANSLITERATIONS = {
     "ź": "z",
     "ż": "z",
     " ": "-",
+    "/": "-",
     "_": "-",
 }
 

{koleo_cli-0.2.137.23.dist-info → koleo_cli-0.2.137.23.3.dist-info}/METADATA

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

koleo_cli-0.2.137.23.3.dist-info/RECORD

@@ -0,0 +1,26 @@
+koleo/__init__.py,sha256=dp6PfGcuWP50QBWhjnT-zS03l3KzzYnMJnUeYMKBayc,51
+koleo/__main__.py,sha256=zRwdn7wRjqzWyDIoQ8PDDd_K2GizFIto35uO-mGFwsQ,63
+koleo/args.py,sha256=tSFfKEFnlb9NWVNZPHnpUuQNv1JA-A_OoOVIssbZnps,11074
+koleo/storage.py,sha256=F_0q-xt0jLQk--dfM8fmyG1tkfaM9d5Rh3sEwYzqGVs,4594
+koleo/utils.py,sha256=KEJpoUKYCDAdFGJPge2xfsbn6UOYI1HEu6XQPVKqWUU,4631
+koleo/api/__init__.py,sha256=3TfO8eBJcDCDXvIFobgyvN3Sfa1kQ2U0lm7gxEAsaWQ,50
+koleo/api/base.py,sha256=8wAasDQ1DBDI1PsPESmS3iUE5csIgaGT4DOX_A-hPwI,2070
+koleo/api/client.py,sha256=h2pGGsE8dZe5bePDOKOonSokMnoqgWE9aIWUcZBjPfs,9346
+koleo/api/errors.py,sha256=J9g75K9_yvnZ-7Hi521h0yGcw9NUNnTprQsIZ_mclO0,1324
+koleo/api/logging.py,sha256=VhOFY6N_mofFfg9ZJ5ZnDVCzNuRilqLqrzZU9b-hpZY,1644
+koleo/api/types.py,sha256=EGApqn-YuD1_9LxwsAttNT6kjFdQ7Ll4YQzT18Q--Q0,12574
+koleo/cli/__init__.py,sha256=mRh-w61QWlVB7joTW9HXP2PbfUWy6-UaD9oksmCnmNA,232
+koleo/cli/aliases.py,sha256=RroIzuMFntUQABdj6SAYab2lH5SRTnUT8FtemNp1wHg,580
+koleo/cli/base.py,sha256=VZNC3z6WZTtTO_ElUFJ3cWnJZJmy07YomnZQBuFdgPs,5111
+koleo/cli/connections.py,sha256=DwfiwquRDH6PCcQHMciVXQCVocmX4zSlPCD_xCfpLa8,6860
+koleo/cli/seats.py,sha256=cswhtDQtJn3Y3LObAyt7sRfjkAyD6-8clMfh2j_0eyY,6399
+koleo/cli/station_board.py,sha256=lRGIeEKEOvUcctM6cwmqVE7Yk9m9R12gfFZahlWLQFc,3669
+koleo/cli/stations.py,sha256=6L3PBWc6xssyR9eeLacuvGBJmaY7Ny3DalKy2Xq7zsA,1633
+koleo/cli/train_info.py,sha256=HDTC3Rz0X14d6OuOey5NinxOaywR7jeVDEgGEUX11c4,7157
+koleo/cli/utils.py,sha256=ISbsabi6fBdCO2tf7X2FjodeG3iRjngFPW93VqMeLq4,667
+koleo_cli-0.2.137.23.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+koleo_cli-0.2.137.23.3.dist-info/METADATA,sha256=cTYIXqw8QYwb4Urii8T3Z6ToXGkMqIYCJUgi0_p3ZNU,4733
+koleo_cli-0.2.137.23.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+koleo_cli-0.2.137.23.3.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
+koleo_cli-0.2.137.23.3.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
+koleo_cli-0.2.137.23.3.dist-info/RECORD,,

koleo_cli-0.2.137.23.dist-info/RECORD

@@ -1,26 +0,0 @@
-koleo/__init__.py,sha256=dp6PfGcuWP50QBWhjnT-zS03l3KzzYnMJnUeYMKBayc,51
-koleo/__main__.py,sha256=zRwdn7wRjqzWyDIoQ8PDDd_K2GizFIto35uO-mGFwsQ,63
-koleo/args.py,sha256=cCOwKOb6s4Am6cypHdRb8Wnkv8Uv5vJuRgukQjGRvtU,11039
-koleo/storage.py,sha256=ebeIIuUBGe96-AizFc3UVaDaczKGuBPwbL318Ft9vrU,4588
-koleo/utils.py,sha256=s58W1zNWQm1KFvvCunRVibrb-Zd7Rd1xWSZkxqr5zYw,4631
-koleo/api/__init__.py,sha256=3TfO8eBJcDCDXvIFobgyvN3Sfa1kQ2U0lm7gxEAsaWQ,50
-koleo/api/base.py,sha256=8wAasDQ1DBDI1PsPESmS3iUE5csIgaGT4DOX_A-hPwI,2070
-koleo/api/client.py,sha256=h2pGGsE8dZe5bePDOKOonSokMnoqgWE9aIWUcZBjPfs,9346
-koleo/api/errors.py,sha256=J9g75K9_yvnZ-7Hi521h0yGcw9NUNnTprQsIZ_mclO0,1324
-koleo/api/logging.py,sha256=VhOFY6N_mofFfg9ZJ5ZnDVCzNuRilqLqrzZU9b-hpZY,1644
-koleo/api/types.py,sha256=EGApqn-YuD1_9LxwsAttNT6kjFdQ7Ll4YQzT18Q--Q0,12574
-koleo/cli/__init__.py,sha256=AFG1RddD3iHryKrlBLC7nAPYOXNAnbwd6ps1ZDUW1lQ,266
-koleo/cli/aliases.py,sha256=RroIzuMFntUQABdj6SAYab2lH5SRTnUT8FtemNp1wHg,580
-koleo/cli/base.py,sha256=dtrPjcLB8GLoQM0yg5zPO6Xjln96aibX39EsjFTCeA4,4956
-koleo/cli/connections.py,sha256=UAcG5L-UW50JiaBY4xShEeMRMy1nZDg-BCPBUZ05Y3c,6873
-koleo/cli/seats.py,sha256=cswhtDQtJn3Y3LObAyt7sRfjkAyD6-8clMfh2j_0eyY,6399
-koleo/cli/station_board.py,sha256=lRGIeEKEOvUcctM6cwmqVE7Yk9m9R12gfFZahlWLQFc,3669
-koleo/cli/stations.py,sha256=6L3PBWc6xssyR9eeLacuvGBJmaY7Ny3DalKy2Xq7zsA,1633
-koleo/cli/train_info.py,sha256=aG6Srbha-dWTHH6zN-LTxAHamcJU_zZn859Y6fNJ7J4,7151
-koleo/cli/utils.py,sha256=ISbsabi6fBdCO2tf7X2FjodeG3iRjngFPW93VqMeLq4,667
-koleo_cli-0.2.137.23.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-koleo_cli-0.2.137.23.dist-info/METADATA,sha256=0HWKrqeCvbJS4W9F2_cp73yIfQxuq8Z8HVa8VIvXhK4,4731
-koleo_cli-0.2.137.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-koleo_cli-0.2.137.23.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
-koleo_cli-0.2.137.23.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
-koleo_cli-0.2.137.23.dist-info/RECORD,,