fix: updated parsing for new Ocado emails (#18)

* fix: updated regex for the new style of receipt pdf

* fix: added some new constants

* fix: updated to reflect the new Ocado emails.

* chore: disable the receipt parsing since the PDF is no longer included in receipt emails.

* chore: disabling BBD sensor by default for the time being to avoid confusion.

* chore: updated dependencies for tests.

* chore: updating versioning according to the bot's wishes

* chore: appeasing the rust bot.

Author: PineappleEmperor

custom_components/ocado/const.py

@@ -6,17 +6,20 @@
 DOMAIN = "ocado"
 
 OCADO_ADDRESS =                 "customerservices@ocado.com"
+NEW_OCADO_ADDRESS =             "noreply@email.ocado.com"
 OCADO_CANCELLATION_SUBJECT =    "Order cancellation confirmation"
 OCADO_CONFIRMATION_SUBJECT =    "Confirmation of your order"
 OCADO_CUTOFF_SUBJECT =          "Don't miss the cut-off time for editing your order"
 OCADO_NEW_TOTAL_SUBJECT =       "What you returned, and your new total"
 OCADO_RECEIPT_SUBJECT =         "Your receipt for today's Ocado delivery"
+OCADO_NEW_NEW_TOTAL_SUBJECT =   "Your receipt and updates for today’s delivery"
 OCADO_SMARTPASS_SUBJECT =       "Payment successful: Smart Pass membership"
 OCADO_SUBJECT_DICT = {
     OCADO_CANCELLATION_SUBJECT: "cancellation",
     OCADO_CONFIRMATION_SUBJECT: "confirmation",
     OCADO_NEW_TOTAL_SUBJECT:    "new_total",
-    OCADO_RECEIPT_SUBJECT:      "receipt"
+    OCADO_RECEIPT_SUBJECT:      "receipt",
+    OCADO_NEW_NEW_TOTAL_SUBJECT:"new_total"
 }
 
 CONF_IMAP_DAYS =     'imap_days'
@@ -52,6 +55,7 @@
 # If this eventually fails due to other formats being used, python-dateutil should be used
 REGEX_DATE_FULL = r"((?:" + REGEX_DATE + r")\/(?:" + REGEX_MONTH + r")\/(?:" + REGEX_YEAR + r"))"
 REGEX_TIME = r"([01][0-9]|2[0-3]):([0-5][0-9])([AaPp][Mm])?"
+REGEX_NOT_ISO_TIME = r"([0-9]|2[0-3]):([0-5][0-9])([AaPp][Mm])?"
 REGEX_ORDINALS = r"st|nd|rd|th"
 
 REGEX_AMOUNT = r"(?:\d+x)?\d+k?(?:g|l|ml)"
@@ -244,11 +248,12 @@ def __init__(self,
     def update_bbds(self, receipt_list: list):
         if self.index_start is None or self.index_end is None:
             raise ValueError
-        delivery_date_raw = re.search(self.regex_date, receipt_list[6])
+        delivery_date_raw = re.search(self.regex_date, receipt_list[11])
         if delivery_date_raw is not None:
             delivery_date_raw = delivery_date_raw.group()
         else:
-            delivery_date_raw = re.search(self.regex_date, receipt_list[7])
+            delivery_date_regex = r"Delivery date:\s(?:" + REGEX_DAY_FULL + r")\s" + REGEX_DATE_FULL
+            delivery_date_raw = re.search(delivery_date_regex, "\n".join(receipt_list))
             if delivery_date_raw is not None:
                 delivery_date_raw = delivery_date_raw.group()
         if delivery_date_raw is None:

custom_components/ocado/manifest.json

@@ -11,9 +11,10 @@
     "iot_class": "cloud_polling",
     "issue_tracker": "https://github.com/PineappleEmperor/ocado-ha/issues",
     "requirements": [
-      "python-dateutil==2.9.0",
-      "pypdf==5.5.0"
+      "python-dateutil>=2.9.0",
+      "pypdf>=5.5.0",
+      "BeautifulSoup4>=4.10.0"
     ],
     "single_config_entry": true,
-    "version": "1.1.0"
+    "version": "1.1.1"
   }

custom_components/ocado/sensor.py

@@ -598,6 +598,9 @@ class OcadoBBDs(CoordinatorEntity, SensorEntity): # type: ignore
 
     _attr_device_class = DEVICE_CLASS # type: ignore
 
+    # Disabled by default
+    _attr_entity_registry_enabled_default = False
+
     def __init__(self, coordinator: OcadoUpdateCoordinator, day: str, context: Any = None,) -> None:
         """Initialise the sensor."""
         super().__init__(coordinator, context=context) # type: ignore