fix: better international handling of amazon (#480)

moralmunky · Jul 13, 2021 · d3e4233 · d3e4233
2 parents a8ec0b0 + b31a947
commit d3e4233
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -24,6 +24,7 @@ jobs:
 
           python -m pip install --upgrade pip
           pip install -r requirements_test.txt
+          sudo apt-get -y install language-pack-it
       - name: Generate coverage report
         run: |
           python -m pytest

diff --git a/custom_components/mail_and_packages/const.py b/custom_components/mail_and_packages/const.py
@@ -73,7 +73,7 @@
 AMAZON_HUB_CODE = "amazon_hub_code"
 AMAZON_HUB_EMAIL = "[email protected]"
 AMAZON_HUB_SUBJECT = "(You have a package to pick up)(.*)- (\\d{6})"
-AMAZON_TIME_PATTERN = "will arrive:,estimated delivery date is:,guaranteed delivery date is:,Arriving:,Arriver:"
+AMAZON_TIME_PATTERN = "will arrive:,estimated delivery date is:,guaranteed delivery date is:,Arriving:,Arriverà:"
 AMAZON_EXCEPTION_SUBJECT = "Delivery update:"
 AMAZON_EXCEPTION_BODY = "running late"
 AMAZON_EXCEPTION = "amazon_exception"

diff --git a/custom_components/mail_and_packages/helpers.py b/custom_components/mail_and_packages/helpers.py
@@ -1177,15 +1177,21 @@ def get_items(
                         email_msg = email_msg.decode("utf-8", "ignore")
                         searches = const.AMAZON_TIME_PATTERN.split(",")
                         for search in searches:
+                            _LOGGER.debug("Looking for: %s", search)
                             if search not in email_msg:
                                 continue
 
                             start = email_msg.find(search) + len(search)
-                            end = email_msg.find("Track your")
+                            end = -1
+                            if email_msg.find("Track your") != -1:
+                                end = email_msg.find("Track your")
+                            elif email_msg.find("Per tracciare il tuo pacco") != -1:
+                                end = email_msg.find("Per tracciare il tuo pacco")
+
                             arrive_date = email_msg[start:end].strip()
                             arrive_date = arrive_date.split(" ")
                             arrive_date = arrive_date[0:3]
-                            arrive_date[2] = arrive_date[2][:2]
+                            # arrive_date[2] = arrive_date[2][:3]
                             arrive_date = " ".join(arrive_date).strip()
                             time_format = None
                             new_arrive_date = None
@@ -1205,13 +1211,22 @@ def get_items(
                                 elif arrive_date.endswith(","):
                                     new_arrive_date = arrive_date.rstrip(",")
                                     time_format = "%A, %B %d"
+                                elif "," not in arrive_date:
+                                    new_arrive_date = arrive_date
+                                    time_format = "%A %d %B"
                                 else:
                                     new_arrive_date = arrive_date
                                     time_format = "%A, %B %d"
 
-                                dateobj = datetime.datetime.strptime(
-                                    new_arrive_date, time_format
-                                )
+                                try:
+                                    dateobj = datetime.datetime.strptime(
+                                        new_arrive_date, time_format
+                                    )
+                                except ValueError as err:
+                                    _LOGGER.warn(
+                                        "International dates not supported. (%s)", err
+                                    )
+                                    continue
 
                                 if (
                                     dateobj.day == datetime.date.today().day

diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -787,6 +787,13 @@ async def test_amazon_shipped_order_it(hass, mock_imap_amazon_shipped_it):
     assert result == ["405-5236882-9395563"]
 
 
+async def test_amazon_shipped_order_it_count(hass, mock_imap_amazon_shipped_it):
+    with patch("datetime.date") as mock_date:
+        mock_date.today.return_value = date(2021, 12, 1)
+        result = get_items(mock_imap_amazon_shipped_it, "count")
+        assert result == 6
+
+
 async def test_amazon_search(hass, mock_imap_no_email):
     result = amazon_search(mock_imap_no_email, "test/path", hass, "testfilename.jpg")
     assert result == 0