bump version 0.1.2

actual_imap_poll/parsers.py

@@ -178,11 +178,16 @@ class CIBCParser(TransactionParser):
         flags=re.MULTILINE,
     )
 
+    PURCHASE_EXTRACT_RE = re.compile(
+        r"made a purchase with your CIBC.*ending in (?P<account>\d{4}) for \$(?P<amount>\d+\.\d{2}) at (?P<payee>.*?).<br",  # noqa: E501
+        re.MULTILINE,
+    )
+
     def __init__(self, account_map: dict[int, UUID]):
         self._account_map = account_map
 
     def match(self, msg: Message) -> bool:
-        return msg["From"] == "CIBC Banking <mailbox.noreply@cibc.com>"
+        return msg["From"] == "CIBC Banking <Mailbox.noreply@cibc.com>"
 
     def extract_payment(self, msg: EmailMessage):
         content = self.get_content(msg)
@@ -209,10 +214,37 @@ class CIBCParser(TransactionParser):
             imported_id=msg["Message-ID"],
         )
 
+    def extract_purchase(self, msg: EmailMessage) -> Optional[Transaction]:
+        content = self.get_content(msg)
+
+        matches = self.PURCHASE_EXTRACT_RE.search(content)
+        if matches is None:
+            raise TransactionParsingFailed("no matches for extraction RE")
+
+        amount = Decimal(matches["amount"].replace(",", "")) * -1
+        date = parse_email_time(msg["Date"]).date()
+        account_ref = int(matches["account"])
+
+        if account_ref not in self._account_map:
+            warning("Account %s not in account map, skipping transaction", account_ref)
+            return None
+        account_id = self._account_map[account_ref]
+
+        return Transaction(
+            account=account_id,
+            date=date,
+            amount=amount,
+            payee=matches["payee"],
+            notes="via email",
+            imported_id=msg["Message-ID"],
+        )
+
     def extract(self, msg: EmailMessage) -> Optional[Transaction]:
         match msg["Subject"]:
             case "New payment to your credit card":
                 return self.extract_payment(msg)
+            case "New purchase on your credit card":
+                return self.extract_purchase(msg)
         return None
 
 
@@ -235,7 +267,7 @@ class ScotiaBankParser(TransactionParser):
         if matches is None:
             raise TransactionParsingFailed("no matches for extraction RE")
 
-        amount = Decimal(matches["amount"].replace(",", ""))
+        amount = Decimal(matches["amount"].replace(",", "")) * -1
         date = parse_email_time(msg["Date"]).date()
 
         if matches["account"] not in self._account_map:

actual_imap_poll/watcher.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import asyncio
 import email.policy
+import importlib.metadata
 import importlib.util
 import logging
 import os
@@ -129,6 +130,11 @@ class App:
 
 def main():
     logging.basicConfig(level=getenv("LOG_LEVEL", "INFO"))
+    logging.info(
+        "actual-imap-parser %s starting up",
+        importlib.metadata.version("actual-imap-poll"),
+    )
     app_config = AppConfig()
+    logging.debug("Config: %s", app_config)
     app = App(app_config, CONFIG_PATH)
     asyncio.run(app.run())

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "actual-imap-poll"
-version = "0.1.1"
+version = "0.1.2"
 description = "Poll an IMAP mailbox looking for transactions to submit to Actual Budget"
 authors = [
     {name = "Keenan Tims",email = "ktims@gotroot.ca"}