koleo-cli 0.2.137.9__tar.gz → 0.2.137.11__tar.gz

{koleo_cli-0.2.137.9/koleo_cli.egg-info → koleo_cli-0.2.137.11}/PKG-INFO

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

{koleo_cli-0.2.137.9 → koleo_cli-0.2.137.11}/koleo/cli.py

@@ -89,6 +89,37 @@ class CLI:
         self.print(station_info)
         self.get_arrivals(st["id"], date)
 
+    def all_trains(self, station: str, date: datetime):
+        st = self.get_station(station)
+        station_info = f"[bold blue][link=https://koleo.pl/dworzec-pkp/{st["name_slug"]}/{date.strftime("%Y-%m-%d")}]{st["name"]} at {date.strftime("%d-%m %H:%M")}[/bold blue] ID: {st["id"]}[/link]"
+        self.print(station_info)
+        arr_cache_id = f"arr-{st['id']}-{date.strftime("%Y-%m-%d")}"
+        dep_cache_id = f"dep-{st['id']}-{date.strftime("%Y-%m-%d")}"
+        arrivals = self.storage.get_cache(arr_cache_id) or self.storage.set_cache(
+            arr_cache_id, self.client.get_arrivals(st['id'], date)
+        )
+        departures = self.storage.get_cache(dep_cache_id) or self.storage.set_cache(
+            dep_cache_id, self.client.get_departures(st['id'], date)
+        )
+        trains = sorted(
+            [(i, 1) for i in departures] + [(i, 2) for i in arrivals],
+            key=lambda train: datetime.fromisoformat(train[0]["departure"] if train[1] == 1 else train[0]["arrival"]).timestamp()
+        )
+        trains = [
+            (i, type)
+            for i, type in trains
+            if datetime.fromisoformat(i["departure"] if type == 1 else i["arrival"]).timestamp() > date.timestamp()  # type: ignore
+        ]
+        brands = self.storage.get_cache("brands") or self.storage.set_cache("brands", self.client.get_brands())
+        parts = []
+        for train, type in trains:
+            time = f"[bold green]{train['departure'][11:16]}[/bold green]" if type == 1 else f"[bold yellow]{train['arrival'][11:16]}[/bold yellow]"
+            brand = next(iter(i for i in brands if i["id"] == train["brand_id"]), {}).get("logo_text")
+            parts.append(
+                f"{time} [red]{brand}[/red] {train["train_full_name"]}[purple] {train["stations"][0]["name"]} {self.format_position(train["platform"], train["track"])}[/purple]"
+            )
+        self.print("\n".join(parts))
+
     def find_station(self, query: str | None):
         if query:
             stations = self.client.find_station(query)
@@ -210,11 +241,8 @@ class CLI:
             dep = arr_dep_to_dt(i["departure"])
             travel_time = (arr - dep).seconds
             parts.append(
-                f"[bold green][link=https://koleo.pl/travel-options/{i["id"]}]{dep.strftime("%H:%M")} - {arr.strftime("%H:%M")}[/bold green] {travel_time//3600}h{(travel_time % 3600)/60:.0f}m {i['distance']}km: [/link]"
+                f"[bold green][link=https://koleo.pl/travel-options/{i["id"]}]{dep.strftime("%H:%M")} - {arr.strftime("%H:%M")}[/bold green] {travel_time//3600}h{(travel_time % 3600)/60:.0f}m {i['distance']}km:[/link]"
             )
-            if i["constriction_info"]:
-                for constriction in i["constriction_info"]:
-                    parts.append(f" [bold red]- {constriction} [/bold red]")
             if len(i["trains"]) == 1:
                 train = i["trains"][0]
                 stop = next(iter(i for i in train["stops"] if i["station_id"] == train["start_station_id"]), {})
@@ -227,10 +255,15 @@ class CLI:
                     )
                 )
                 brand = next(iter(i for i in api_brands if i["id"] == train["brand_id"]), {}).get("logo_text")
+                s = f" [red]{brand}[/red] {train["train_full_name"]}[purple] {stop_station['name']} {self.format_position(stop["platform"], stop["track"])}[/purple]"
                 parts[-1] += (
                     f" [red]{brand}[/red] {train["train_full_name"]}[purple] {stop_station['name']} {self.format_position(stop["platform"], stop["track"])}[/purple]"
                 )
+                for constriction in i["constriction_info"]:
+                    parts.append(f" [bold red]- {constriction}[/bold red]")
             else:
+                for constriction in i["constriction_info"]:
+                    parts.append(f" [bold red]- {constriction}[/bold red]")
                 previous_arrival: datetime | None = None
                 for train in i["trains"]:
                     brand = next(iter(i for i in api_brands if i["id"] == train["brand_id"]), {}).get("logo_text")
@@ -356,6 +389,26 @@ def main():
     arrivals.add_argument("-s", "--save", help="save the station as your default one", action="store_true")
     arrivals.set_defaults(func=cli.full_arrivals, pass_=["station", "date"])
 
+    all_trains = subparsers.add_parser(
+        "all", aliases=["w", "wszystkie", "all_trains", "pociagi"], help="Allows you to list all station trains"
+    )
+    all_trains.add_argument(
+        "station",
+        help="The station name",
+        default=None,
+        nargs="*",
+        action=RemainderString,
+    )
+    all_trains.add_argument(
+        "-d",
+        "--date",
+        help="the date",
+        type=lambda s: parse_datetime(s),
+        default=datetime.now(),
+    )
+    all_trains.add_argument("-s", "--save", help="save the station as your default one", action="store_true")
+    all_trains.set_defaults(func=cli.all_trains, pass_=["station", "date"])
+
     train_route = subparsers.add_parser(
         "trainroute",
         aliases=["r", "tr", "t", "poc", "pociąg"],
@@ -445,7 +498,6 @@ def main():
         args.station = storage.favourite_station
     elif hasattr(args, "station") and args.save:
         storage.favourite_station = args.station
-        storage.save()
     if not hasattr(args, "func"):
         if storage.favourite_station:
             cli.full_departures(storage.favourite_station, datetime.now())
@@ -454,3 +506,6 @@ def main():
             exit()
     else:
         args.func(**{k: v for k, v in args.__dict__.items() if k in getattr(args, "pass_", [])})
+
+    if storage._dirty:
+        storage.save()

{koleo_cli-0.2.137.9 → koleo_cli-0.2.137.11}/koleo/storage.py

@@ -33,6 +33,7 @@ class Storage:
 
     def __post_init__(self):
         self._path: str
+        self._dirty = False
 
     @classmethod
     def load(cls, *, path: str = DEFAULT_CONFIG_PATH) -> t.Self:
@@ -57,13 +58,13 @@ class Storage:
             return item
         else:
             self.cache.pop(id)
-            self.save()
+            self._dirty = True
 
     def set_cache(self, id: str, item: T, ttl: int = 86400) -> T:
         if self.disable_cache:
             return item
         self.cache[id] = (int(time() + ttl), item)
-        self.save()
+        self._dirty = True
         return item
 
     def save(self):
@@ -72,4 +73,12 @@ class Storage:
             if not ospath.exists(dir):
                 makedirs(dir)
         with open(self._path, "w+") as f:
+            self.clean()
             dump(asdict(self), f, indent=True)
+
+    def clean(self):
+        now = time()
+        copy = self.cache.copy()
+        self.cache = {k: data for k, data in copy.items() if data[0] > now}
+        if copy != self.cache:
+            self._dirty = True

{koleo_cli-0.2.137.9 → koleo_cli-0.2.137.11/koleo_cli.egg-info}/PKG-INFO

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

{koleo_cli-0.2.137.9 → koleo_cli-0.2.137.11}/setup.py

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