fixes #9

Author: jph00

markdown_merge/core.py

@@ -38,21 +38,22 @@ def attach_file(msg, f):
     msg.attach(part)
 
 # %% ../nbs/00_core.ipynb
-def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None):
+def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None, hdrs=None):
     "Create a multipart email with markdown text and HTML"
     msg = MIMEMultipart('alternative', policy=EmailPolicy())
     msg['Subject'],msg['From'] = subj,str(from_addr)
+    for k,v in (hdrs or {}).items(): msg[k]=v
     msg['To'] = ', '.join([str(a) for a in listify(to_addrs)])
     if md: msg.attach(MIMEText(md, 'plain'))
     if html: msg.attach(MIMEText(html, 'html'))
     for f in listify(attach): attach_file(msg, f)
     return msg
 
 # %% ../nbs/00_core.ipynb
-def md2email(subj, from_addr, to_addrs, md, attach=None):
+def md2email(subj, from_addr, to_addrs, md, attach=None, hdrs=None):
     "Create a multipart email from markdown"
     html = markdown(md)
-    return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach)
+    return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach, hdrs=hdrs)
 
 # %% ../nbs/00_core.ipynb
 def smtp_connection(host, port, user=None, password=None, use_ssl=True, use_tls=False):
@@ -65,18 +66,18 @@ def smtp_connection(host, port, user=None, password=None, use_ssl=True, use_tls=
 # %% ../nbs/00_core.ipynb
 class MarkdownMerge:
     "Send templated email merge messages formatted with Markdown"
-    def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False):
+    def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False, hdrs=None):
         self.addrs,self.from_addr,self.subj,self.msg,self.i = addrs,from_addr,subj,msg,0
         self.inserts = [{}]*len(addrs) if inserts is None else inserts
-        self.smtp_cfg,self.test = smtp_cfg,test
+        self.smtp_cfg,self.test,self.hdrs = smtp_cfg,test,hdrs
 
     def send_msgs(self, pause=0.2):
         "Send all unsent messages to `addrs` with `pause` secs between each send"
         conn = smtp_connection(**self.smtp_cfg)
         while self.i < len(self.addrs):
             addr,insert = self.addrs[self.i],self.inserts[self.i]
             msg = self.msg.format(**insert)
-            eml = md2email(self.subj, self.from_addr, addr, md=msg)
+            eml = md2email(self.subj, self.from_addr, addr, md=msg, hdrs=self.hdrs)
             if self.test: print(f"To: {addr}\n{'-'*40}\n{msg}\n{'='*40}\n")
             else:
                 conn.send_message(eml)

nbs/00_core.ipynb

@@ -158,10 +158,11 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None):\n",
+    "def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None, hdrs=None):\n",
     "    \"Create a multipart email with markdown text and HTML\"\n",
     "    msg = MIMEMultipart('alternative', policy=EmailPolicy())\n",
     "    msg['Subject'],msg['From'] = subj,str(from_addr)\n",
+    "    for k,v in (hdrs or {}).items(): msg[k]=v\n",
     "    msg['To'] = ', '.join([str(a) for a in listify(to_addrs)])\n",
     "    if md: msg.attach(MIMEText(md, 'plain'))\n",
     "    if html: msg.attach(MIMEText(html, 'html'))\n",
@@ -176,9 +177,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "msg = create_multipart_msg('Test Subject', from_addr, to_addrs, md='**Bold text**', html='<b>Bold text</b>')\n",
+    "msg = create_multipart_msg('Test Subject', from_addr, to_addrs, hdrs={'atest':'foo'},\n",
+    "                           md='**Bold text**', html='<b>Bold text</b>')\n",
     "test_eq(msg['Subject'], 'Test Subject')\n",
     "test_eq(msg['From'], str(from_addr))\n",
+    "test_eq(msg['atest'], 'foo')\n",
     "test_eq(len(msg.get_payload()), 2)\n",
     "test_eq(msg.get_payload()[0].get_content_type(), 'text/plain')\n",
     "test_eq(msg.get_payload()[1].get_content_type(), 'text/html')\n",
@@ -193,10 +196,10 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def md2email(subj, from_addr, to_addrs, md, attach=None):\n",
+    "def md2email(subj, from_addr, to_addrs, md, attach=None, hdrs=None):\n",
     "    \"Create a multipart email from markdown\"\n",
     "    html = markdown(md)\n",
-    "    return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach)"
+    "    return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach, hdrs=hdrs)"
    ]
   },
   {
@@ -384,18 +387,18 @@
     "#| export\n",
     "class MarkdownMerge:\n",
     "    \"Send templated email merge messages formatted with Markdown\"\n",
-    "    def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False):\n",
+    "    def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False, hdrs=None):\n",
     "        self.addrs,self.from_addr,self.subj,self.msg,self.i = addrs,from_addr,subj,msg,0\n",
     "        self.inserts = [{}]*len(addrs) if inserts is None else inserts\n",
-    "        self.smtp_cfg,self.test = smtp_cfg,test\n",
+    "        self.smtp_cfg,self.test,self.hdrs = smtp_cfg,test,hdrs\n",
     "\n",
     "    def send_msgs(self, pause=0.2):\n",
     "        \"Send all unsent messages to `addrs` with `pause` secs between each send\"\n",
     "        conn = smtp_connection(**self.smtp_cfg)\n",
     "        while self.i < len(self.addrs):\n",
     "            addr,insert = self.addrs[self.i],self.inserts[self.i]\n",
     "            msg = self.msg.format(**insert)\n",
-    "            eml = md2email(self.subj, self.from_addr, addr, md=msg)\n",
+    "            eml = md2email(self.subj, self.from_addr, addr, md=msg, hdrs=self.hdrs)\n",
     "            if self.test: print(f\"To: {addr}\\n{'-'*40}\\n{msg}\\n{'='*40}\\n\")\n",
     "            else:\n",
     "                conn.send_message(eml)\n",
@@ -512,7 +515,13 @@
    ]
   }
  ],
- "metadata": {},
+ "metadata": {
+  "kernelspec": {
+   "display_name": "python3",
+   "language": "python",
+   "name": "python3"
+  }
+ },
  "nbformat": 4,
  "nbformat_minor": 5
 }