Added Alexa Music

custom_components/mail_and_packages/const.py

@@ -12,7 +12,7 @@ from .entity import MailandPackagesBinarySensorEntityDescription
 
 DOMAIN = "mail_and_packages"
 DOMAIN_DATA = f"{DOMAIN}_data"
-VERSION = "0.5.15"
+VERSION = "0.5.16"
 ISSUE_URL = "http://github.com/moralmunky/Home-Assistant-Mail-And-Packages"
 PLATFORM = "sensor"
 PLATFORMS = ["binary_sensor", "camera", "sensor"]
@@ -176,6 +176,8 @@ AMAZON_SHIPMENT_SUBJECT = [
     "Enviado:",
     "Out for delivery:",
     "Spedito:",
+    "Versandt:",
+    "In Zustellung:",
 ]
 AMAZON_ORDERED_SUBJECT = ["Ordered:", "Pedido efetuado:"]
 AMAZON_EMAIL = [
@@ -222,6 +224,7 @@ AMAZON_TIME_PATTERN = [
     "Verwachte bezorgdatum:",
     "Votre date de livraison prévue est :",
     "In arrivo",
+    "Zustellung:",
 ]
 AMAZON_TIME_PATTERN_END = [
     "Previously expected:",
@@ -243,9 +246,10 @@ AMAZON_TIME_PATTERN_REGEX = [
     "Arriving (\\w+ \\d+)",
     "Arriving (\\w+ ?\\d*)",
     "Arriving (\\w+)",
-    "Zustellung (\\w+ \\d+) - (\\w+ \\d+)",
-    "Zustellung (\\w+ \\d+)",
-    "Zustellung (\\w+ \\d*)",
+    "Zustellung:? (\\w+ \\d+) - (\\w+ \\d+)",
+    "Zustellung:? (\\w+ \\d+)",
+    "Zustellung:? (\\w+ ?\\d*)",
+    "Zustellung:? (\\w+)",
     "Arriverà (\\w+ \\d+) - (\\w+ \\d+)",
     "Arriverà (\\w+ \\d+)",
     "Arriverà (\\w+ \\d*)",
@@ -804,6 +808,7 @@ SENSOR_DATA = {
             "notifications@dragonflyshipping.ca",
             "notifications@dragonflyshipping.com",
             "notifications@nl.dragonflyinternational.com",
+            "notifications@ca.dragonflyinternational.com",
         ],
         "subject": [
             "Your order has been delivered!",
@@ -812,6 +817,7 @@ SENSOR_DATA = {
             "Votre commande a été livrée!",
             "Votre colis a été livré!",
             "We hebben je pakket bezorgd!",
+            "Hooray! Your package was delivered!",
         ],
     },
     "intelcom_delivering": {
@@ -820,6 +826,7 @@ SENSOR_DATA = {
             "notifications@dragonflyshipping.ca",
             "notifications@dragonflyshipping.com",
             "notifications@nl.dragonflyinternational.com",
+            "notifications@ca.dragonflyinternational.com",
         ],
         "subject": [
             "Your package is on the way!",
@@ -827,6 +834,8 @@ SENSOR_DATA = {
             "Votre colis est en chemin!",
             "package is on its way",
             "Vandaag bezorgen we je pakket",
+            "Your delivery is scheduled for today",
+            "Your package will be there in the next hour!",
         ],
     },
     "intelcom_packages": {
@@ -835,6 +844,7 @@ SENSOR_DATA = {
             "notifications@dragonflyshipping.ca",
             "notifications@dragonflyshipping.com",
             "notifications@nl.dragonflyinternational.com",
+            "notifications@ca.dragonflyinternational.com",
         ],
         "subject": [
             "Your package has been received!",
@@ -843,7 +853,9 @@ SENSOR_DATA = {
             "Je pakket is bij ons aangekomen",
         ],
     },
-    "intelcom_tracking": {"pattern": ["(NSPRSO[0-9]{10}|AMZNL[0-9]{12})"]},
+    "intelcom_tracking": {
+        "pattern": ["(NSPRSO[0-9]{10}|AMZNL[0-9]{12}|INTLCMI[0-9]+)"]
+    },
     # Walmart
     "walmart_delivering": {
         "email": ["help@walmart.com"],

custom_components/mail_and_packages/manifest.json

@@ -18,5 +18,5 @@
     "dateparser",
     "aioimaplib"
   ],
-  "version": "0.5.15"
+  "version": "0.5.16"
 }

custom_components/mail_and_packages/shippers/post_de.py

@@ -207,6 +207,8 @@ class PostDEShipper(Shipper):
             if target.is_file():
                 cleanup_images(path + "/", name)
             src = custom_img or str(Path(__file__).parent.parent / "mail_none.gif")
+            if not Path(src).is_absolute():
+                src = self.hass.config.path(src)
             shutil.copyfile(src, str(target))
 
         _LOGGER.debug("No Post DE mail found.")

custom_components/mail_and_packages/shippers/usps.py

@@ -262,6 +262,8 @@ class USPSShipper(Shipper):
             if target.is_file():
                 cleanup_images(path, name)
             src = custom_img or str(Path(__file__).parent.parent / "mail_none.gif")
+            if not Path(src).is_absolute():
+                src = self.hass.config.path(src)
             shutil.copyfile(src, str(target))
 
         _LOGGER.debug("No mail found.")

custom_components/mail_and_packages/utils/amazon.py

@@ -42,7 +42,14 @@ _LOGGER = logging.getLogger(__name__)
 _MAX_IMAGE_SIZE = 10 * 1024 * 1024  # 10 MB
 
 DOMAIN_LANG_MAP = {
-    "amazon.de": ["versandbestaetigung", "Geliefert:", "Zugestellt:"],
+    "amazon.de": [
+        "versandbestaetigung",
+        "Geliefert:",
+        "Zugestellt:",
+        "Versandt:",
+        "In Zustellung:",
+        "Zustellung:",
+    ],
     "amazon.it": [
         "conferma-spedizione",
         "Consegna effettuata:",