bugfixes

Author: iiPythonx

usps/__init__.py

@@ -1 +1 @@
-__version__ = "0.7.2"
+__version__ = "0.7.3"

usps/__main__.py

@@ -49,7 +49,7 @@ def ordinal(day: int) -> str:
 
     # Print out steps
     location_max = len(max(package.steps, key = lambda _package: len(_package.location)).location)
-    for step in package.steps:
+    for step in package.steps[:10]:
         location_block = f"[yellow]{step.location}[/]{' ' * (location_max - len(step.location))}"
         con.print(f"\t[cyan]{step.details}[/]\t{location_block}\t[bright_blue]{get_delta(step.location, step.time)}[/]")
 
@@ -75,7 +75,7 @@ def command_track(tracking_number: typing.Annotated[typing.Optional[str], typer.
 @app.command("add")
 def command_add(tracking_numbers: list[str]) -> None:
     """Add tracking numbers to your package list."""
-    packages.save(packages.load() | {number: "" for number in tracking_numbers})
+    packages.save(packages.load() | {number: None for number in tracking_numbers})
     for tracking_number in tracking_numbers:
         con.print(f"[green]✓ USPS {tracking_number} added to your package list.[/]")
 

usps/storage.py

@@ -2,7 +2,6 @@
 
 # Modules
 import json
-import typing
 from pathlib import Path
 
 # Initialization
@@ -14,13 +13,13 @@ class PackageStorage:
     def __init__(self) -> None:
         self.package_file = usps_global / "packages.json"
 
-    def load(self) -> typing.Mapping[str, str | None]:
+    def load(self) -> dict[str, str | None]:
         if not self.package_file.is_file():
             return {}
 
         return json.loads(self.package_file.read_text())
 
-    def save(self, _packages: typing.Mapping[str, str | None]) -> None:
+    def save(self, _packages: dict[str, str | None]) -> None:
         self.package_file.write_text(json.dumps(_packages, indent = 4))
 
 packages = PackageStorage()

usps/tracking.py

@@ -84,7 +84,7 @@ def __init__(self) -> None:
 
     @staticmethod
     def __map_step_details(details: str) -> str:
-        if "between" in details.lower():
+        if "expected delivery" in details.lower():
             return "Delivering"
 
         details = details.split(", ")[-1].lower()
@@ -188,7 +188,7 @@ def find_object(class_name: str, parent: Tag | None = None) -> Tag | None:
             # Estimated delivery
             [
                 datetime.strptime(
-                    f"{get_text(find_object('date')).zfill(2)} {month} {year} {time}",
+                    f"{get_text(find_object('date')).zfill(2)} {month} {year} {time.strip()}",
                     "%d %B %Y %I:%M%p"
                 )
                 for time in times