more step mappings, log unknown mappings, allow unknown time

Author: iiPythonx

usps/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.2"
+__version__ = "0.9.3"

usps/__main__.py

@@ -62,7 +62,7 @@ def ordinal(day: int) -> str:
     location_max = len(max(package.steps, key = lambda _package: len(_package.location)).location)
     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)}[/]")
+        con.print(f"\t[cyan]{step.details}[/]\t{location_block}\t[bright_blue]{get_delta(step.location, step.time) if step.time else ''}[/]")
 
     print()
 

usps/tracking/__init__.py

@@ -11,17 +11,17 @@
 # Typing
 @dataclass
 class Step:
-    details: str
-    location: str
-    time: datetime
+    details:    str
+    location:   str
+    time:       datetime | None
 
 @dataclass
 class Package:
-    expected: list[datetime] | None
-    last_status: str | None
-    state: str
-    steps: list[Step]
-    service: str | None
+    expected:       list[datetime] | None
+    last_status:    str | None
+    state:          str
+    steps:          list[Step]
+    service:        str | None
 
 # Global exceptions
 class StatusNotAvailable(Exception):

usps/tracking/ups.py

@@ -94,7 +94,7 @@ def track_package(cls, tracking_number: str) -> Package:
                     cls.__map_milestone_name((step["milestoneName"] or {"name": step["activityScan"]})["name"]),
                     step["location"].replace("United States", "US").upper() if "," in step["location"] else "",
                     datetime.strptime(f"{step['gmtDate']} {step['gmtTime']}", "%Y%m%d %H:%M:%S").replace(tzinfo = LOCAL_TIMEZONE) +\
-                         timedelta(hours = int(step["gmtOffset"].split(":")[0])) if step["gmtDate"] else datetime.now()
+                         timedelta(hours = int(step["gmtOffset"].split(":")[0])) if step["gmtDate"] else None
                 )
                 for step in data["shipmentProgressActivities"]
             ],

usps/tracking/usps.py

@@ -38,14 +38,19 @@
     "arriving on time":                                 "Package On Time",
     "accepted at usps origin facility":                 "Accepted",
     "accepted at usps destination facility":            "Accepted",
+    "acceptance":                                       "Accepted",
     "package acceptance pending":                       "Arrived",
     "in/at mailbox":                                    "Delivered",
     "garage / other door / other location at address":  "Delivered",
     "left with individual":                             "Delivered",
+    "front door/porch":                                 "Delivered",
     "redelivery scheduled for next business day":       "Rescheduled",
     "available for pickup":                             "Available", 
     "reminder to schedule redelivery of your item":     "Reminder",
-    "arriving late":                                    "Arriving Late"
+    "arriving late":                                    "Arriving Late",
+    "processed through facility":                       "Processed",
+    "processed through usps facility":                  "Processed",
+    "origin post is preparing shipment":                "Preparing"
 }
 
 # Main class
@@ -120,14 +125,18 @@ def track_package(cls, tracking_number: str) -> Package:
             if details.lower() == "reminder to schedule redelivery of your item":
                 location = "SCHEDULE REDELIVERY"
 
+            detail_mapping = details.split(", ")[-1].lower()
+            if detail_mapping not in USPS_STEP_DETAIL_MAPPING:
+                print(f"Missing step mapping! Post this on GitHub: \"{detail_mapping}\" / \"{details}\"")
+
             steps.append(Step(
-                USPS_STEP_DETAIL_MAPPING.get(details.split(", ")[-1].lower(), "Unknown")
-                        if "expected delivery" not in details.lower() else "Delivering",
+                USPS_STEP_DETAIL_MAPPING.get(detail_mapping, "Unknown")
+                        if "expected delivery" not in detail_mapping.lower() else "Delivering",
                 location or "",
                 datetime.strptime(
                     time,
                     "%B %d, %Y, %I:%M %p" if ":" in time else "%B %d, %Y"
-                )
+                ) if time.strip() else None
             ))
 
         postal_product = tree.css_first(".product_info > li:first-child")