koleo-cli 0.2.137.19__py3-none-any.whl → 0.2.137.21__py3-none-any.whl

koleo/args.py

@@ -14,6 +14,8 @@ def main():
 
     parser = ArgumentParser("koleo", description="Koleo CLI")
     parser.add_argument("-c", "--config", help="Custom config path.", default=DEFAULT_CONFIG_PATH)
+    parser.add_argument("--ignore_cache", action="store_true", default=False)
+
     parser.add_argument("--nocolor", help="Disable color output and formatting", action="store_true", default=False)
     subparsers = parser.add_subparsers(title="actions", required=False)  # type: ignore
 
@@ -169,20 +171,20 @@ def main():
     connections.add_argument(
         "-n",
         "--direct",
-        help="whether or not the result should only include direct trains",
+        help="whether the result should only include direct trains",
         action="store_true",
         default=False,
     )
     connections.add_argument(
         "-p",
         "--include_prices",
-        help="whether or not the result should include the price",
+        help="whether the result should include the price",
         action="store_true",
         default=False,
     )
     connections.add_argument(
         "--only_purchasable",
-        help="whether or not the result should include only purchasable connections",
+        help="whether the result should include only purchasable connections",
         action="store_true",
         default=False,
     )
@@ -218,8 +220,14 @@ def main():
     train_passenger_stats.add_argument(
         "-t", "--type", help="limit the result to seats of a given type", type=str, required=False
     )
+    train_passenger_stats.add_argument(
+        "--detailed",
+        help="whether to display occupancy status for each seat",
+        action="store_true",
+        default=False,
+    )
     train_passenger_stats.set_defaults(
-        func=cli.train_passenger_stats_view, pass_=["brand", "name", "date", "stations", "type"]
+        func=cli.train_passenger_stats_view, pass_=["brand", "name", "date", "stations", "type", "detailed"]
     )
 
     train_connection_stats = subparsers.add_parser(
@@ -230,8 +238,14 @@ def main():
     train_connection_stats.add_argument(
         "-t", "--type", help="limit the result to seats of a given type", type=str, required=False
     )
+    train_connection_stats.add_argument(
+        "--detailed",
+        help="whether to display occupancy status for each seat",
+        action="store_true",
+        default=False,
+    )
     train_connection_stats.add_argument("connection_id", help="The koleo ID", type=int)
-    train_connection_stats.set_defaults(func=cli.train_connection_stats_view, pass_=["connection_id", "type"])
+    train_connection_stats.set_defaults(func=cli.train_connection_stats_view, pass_=["connection_id", "type", "detailed"])
 
     aliases = subparsers.add_parser("aliases", help="Save quick aliases for station names!")
     aliases.set_defaults(func=cli.alias_list_view)
@@ -250,9 +264,15 @@ def main():
     aliases_remove.add_argument("alias", help="The alias")
     aliases_remove.set_defaults(func=cli.alias_remove_view, pass_=["alias"])
 
+    clear_cache = subparsers.add_parser(
+        "clear_cache",
+        help="Allows you to clear koleo-cli cache",
+    )
+    clear_cache.set_defaults(func="clear_cache")
+
     args = parser.parse_args()
 
-    storage = Storage.load(path=args.config)
+    storage = Storage.load(path=args.config, ignore_cache=args.ignore_cache)
     client = KoleoAPI()
 
     async def run_view(func, *args, **kwargs):
@@ -274,6 +294,9 @@ def main():
         else:
             parser.print_help()
     else:
-        run(run_view(args.func, **{k: v for k, v in args.__dict__.items() if k in getattr(args, "pass_", [])}))
+        if args.func == "clear_cache":
+            storage.clear_cache()
+        else:
+            run(run_view(args.func, **{k: v for k, v in args.__dict__.items() if k in getattr(args, "pass_", [])}))
     if storage.dirty:
         storage.save()

koleo/cli/base.py

@@ -80,7 +80,10 @@ class BaseCli:
     def format_position(self, platform: str, track: str | None = None):
         res = str(convert_platform_number(platform) or "" if not self.storage.use_roman_numerals else platform)
         if track is not None and track != "":
-            res += f"/{track}"
+            if self.storage.platform_first:
+                res += f"/{track}"
+            else:
+                res = f"{track}/{res}"
         return res
 
     async def get_station(self, station: str) -> ExtendedStationInfo:
@@ -101,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/seats.py

@@ -16,6 +16,7 @@ class Seats(TrainInfo):
         date: datetime,
         stations: tuple[str, str] | None = None,
         type: str | None = None,
+        detailed: bool = False,
     ):
         train_calendars = await self.get_train_calendars(brand, name)
         if not (train_id := train_calendars[0]["date_train_map"].get(date.strftime("%Y-%m-%d"))):
@@ -48,28 +49,37 @@ class Seats(TrainInfo):
             direct=True,
             date=koleo_time_to_dt(train_stops_by_slug[first_station]["departure"], base_date=date),
         )
-        connection = next(iter(i for i in connections if i["trains"][0]["train_id"] == train_details["train"]["id"]))
+        connection = next(iter(i for i in connections if i["trains"][0]["train_id"] == train_details["train"]["id"]), None)
+        if connection is None:
+            await self.error_and_exit("Train not found:<")
         connection_train = connection["trains"][0]
         if connection_train["brand_id"] not in BRAND_SEAT_TYPE_MAPPING:
             await self.error_and_exit(f"Brand [underline]{connection_train["brand_id"]}[/underline] is not supported.")
         await self.show_train_header(
             train_details, train_stops_by_slug[first_station], train_stops_by_slug[last_station]
         )
-        await self.train_seat_info(connection["id"], type, connection_train["brand_id"], connection_train["train_nr"])
+        await self.train_seat_info(connection["id"], type, connection_train["brand_id"], connection_train["train_nr"], detailed=detailed)
 
-    async def train_connection_stats_view(self, connection_id: int, type: str | None):
+    async def train_connection_stats_view(self, connection_id: int, type: str | None, detailed: bool = False):
         connection = await self.client.get_connection(connection_id)
         train = connection["trains"][0]
         if train["brand_id"] not in BRAND_SEAT_TYPE_MAPPING:
             await self.error_and_exit(f'Brand [underline]{train["brand_id"]}[/underline] is not supported.')
-        print(connection)
         train_details = await self.client.get_train(train["train_id"])
         first_stop = next(iter(i for i in train_details["stops"] if i["station_id"] == connection["start_station_id"]))
         last_stop = next(iter(i for i in train_details["stops"] if i["station_id"] == connection["end_station_id"]))
         await self.show_train_header(train_details, first_stop, last_stop)
-        await self.train_seat_info(connection_id, type, train["brand_id"], train["train_nr"])
+        await self.train_seat_info(connection_id, type, train["brand_id"], train["train_nr"], detailed=detailed)
 
-    async def train_seat_info(self, connection_id: int, type: str | None, brand_id: int, train_nr: int):
+    async def train_seat_info(
+        self,
+        connection_id: int,
+        type: str | None,
+        brand_id: int,
+        train_nr: int,
+        *,
+        detailed: bool = False
+    ):
         seat_name_map = BRAND_SEAT_TYPE_MAPPING[brand_id]
         if type is not None:
             if type.isnumeric() and int(type) in seat_name_map:
@@ -83,7 +93,6 @@ class Seats(TrainInfo):
         res: dict[int, SeatsAvailabilityResponse] = {}
         for seat_type in types:
             res[seat_type] = await self.client.get_seats_availability(connection_id, train_nr, seat_type)
-        total_seats = sum(len(i["seats"]) for i in res.values())
         for seat_type, result in res.items():
             counters: dict[SeatState, int] = {"FREE": 0, "RESERVED": 0, "BLOCKED": 0}
             for seat in result["seats"]:
@@ -91,7 +100,6 @@ class Seats(TrainInfo):
             color = CLASS_COLOR_MAP.get(seat_name_map[seat_type], "")
             self.print(f"[bold {color}]{seat_name_map[seat_type]}: [/bold {color}]")
             total = sum(i for i in counters.values())
-            not_available = counters["BLOCKED"] + counters["RESERVED"]
             self.print(
                 f"  Free: [{color}]{counters["FREE"]}/{total}, ~{counters["FREE"]/total*100:.1f}%[/{color}]"
             )
@@ -101,3 +109,15 @@ class Seats(TrainInfo):
             self.print(
                 f"  Blocked: [underline {color}]{counters["BLOCKED"]}[/underline {color}]"
             )
+            taken = counters["BLOCKED"] + counters["RESERVED"]
+            self.print(
+                f"  Total: [underline {color}]{taken}/{total}, ~{taken/total*100:.1f}%[/underline {color}]"
+            )
+
+        if detailed: # super temporary!!!!!!
+            for seat_type, result in res.items():
+                type_color = CLASS_COLOR_MAP.get(seat_name_map[seat_type], "")
+                self.print(f"[bold {type_color}]{seat_name_map[seat_type]}: [/bold {type_color}]")
+                for seat in result["seats"]:
+                    color = "green" if seat["state"] == "FREE" else "red"
+                    self.print(f" [{type_color}]{seat["carriage_nr"]}[/{type_color}] {seat['seat_nr']}: [{color}]{seat["state"]}[/{color}]")

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(" ", "-", count=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(" ", "-", count=1).replace(" ", "%20")}"
         )
         if date:
             link += f"/{date}"

koleo/storage.py

@@ -74,18 +74,20 @@ class Storage:
     show_connection_id: bool = False
     use_country_flags_emoji: bool = True
     use_station_type_emoji: bool = True
+    platform_first: bool = False
     auth: Auth | None = None
 
     def __post_init__(self):
         self._path: str
         self._dirty = False
+        self._ignore_cache = False
 
     @property
     def dirty(self) -> bool:
         return self._dirty
 
     @classmethod
-    def load(cls, *, path: str = DEFAULT_CONFIG_PATH) -> t.Self:
+    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:
@@ -94,10 +96,11 @@ class Storage:
             data = {}
         storage = cls(**data)
         storage._path = expanded
+        storage._ignore_cache = ignore_cache
         return storage
 
     def get_cache(self, id: str) -> t.Any | None:
-        if self.disable_cache:
+        if self.disable_cache or self._ignore_cache:
             return None
         cache_result = self.cache.get(id)
         if not cache_result:
@@ -123,6 +126,10 @@ class Storage:
         if copy != self.cache:
             self._dirty = True
 
+    def clear_cache(self):
+        self.cache = {}
+        self._dirty = True
+
     def save(self):
         dir = ospath.dirname(self._path)
         if dir:

{koleo_cli-0.2.137.19.dist-info → koleo_cli-0.2.137.21.dist-info}/METADATA

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

{koleo_cli-0.2.137.19.dist-info → koleo_cli-0.2.137.21.dist-info}/RECORD

@@ -1,7 +1,7 @@
 koleo/__init__.py,sha256=dp6PfGcuWP50QBWhjnT-zS03l3KzzYnMJnUeYMKBayc,51
 koleo/__main__.py,sha256=zRwdn7wRjqzWyDIoQ8PDDd_K2GizFIto35uO-mGFwsQ,63
-koleo/args.py,sha256=gncN8HA8a67U1Wpt3lc32bvPBydn0uCkSmiCZNVQRGk,10275
-koleo/storage.py,sha256=pffcqpTakYp8o6dbVMkD5oF13R6L2eQR3ambU8qTRuM,4345
+koleo/args.py,sha256=glXMFflV4TMHA1JYEFf54MCry2bSLEOa7ap8bPiJZA0,11025
+koleo/storage.py,sha256=_-vpcO6MwbTsnCNWhaHe9xRKm9jpO0Xl0OOyXSmZJzs,4587
 koleo/utils.py,sha256=OAjm90SN1BqpgNF8OTAaR9atyLNYIGy5owZ2pLP5OAM,4631
 koleo/api/__init__.py,sha256=3TfO8eBJcDCDXvIFobgyvN3Sfa1kQ2U0lm7gxEAsaWQ,50
 koleo/api/base.py,sha256=8wAasDQ1DBDI1PsPESmS3iUE5csIgaGT4DOX_A-hPwI,2070
@@ -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=Rdv8FwenM0ymSHNrW9faGYI6mr65EL-n24bN5YXfLkg,4261
+koleo/cli/base.py,sha256=4vnQ4HS5GD6WXReWiJs1E7Bt8cDU4anlZCDb8xXqXS0,4954
 koleo/cli/connections.py,sha256=LJzoq3ADVUmBeqF4-h_me3pZbBHYg1sG3MaDYprwuLU,6873
-koleo/cli/seats.py,sha256=hIALtopQPD-BcBGI_XpPo3ht6f_D5e16VpI7mFgN0Ao,5477
+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=bwM1pGH4-nqhw8V8hiQqs_LlRmpYf09GbKwNiYBjndc,7176
 koleo/cli/utils.py,sha256=FzPGcJdwRwcz10mYiW63Y4zpjM9j6DzNH91UNR3MS8s,666
-koleo_cli-0.2.137.19.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-koleo_cli-0.2.137.19.dist-info/METADATA,sha256=Ewvfre33HQFcAPNrlK_KmD8teeBHXJf_-ZxT4DLX5iA,4731
-koleo_cli-0.2.137.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-koleo_cli-0.2.137.19.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
-koleo_cli-0.2.137.19.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
-koleo_cli-0.2.137.19.dist-info/RECORD,,
+koleo_cli-0.2.137.21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+koleo_cli-0.2.137.21.dist-info/METADATA,sha256=IF1UExJ-_VDEyTKdegvJOu9qYllZdfsS4ipTW1OGBr4,4731
+koleo_cli-0.2.137.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+koleo_cli-0.2.137.21.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
+koleo_cli-0.2.137.21.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
+koleo_cli-0.2.137.21.dist-info/RECORD,,