Email: separated inline and attachment

vishr · vishr · commit 238b127b3a48 · 2017-07-23T17:35:46.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/labstack/email.py b/labstack/email.py
@@ -4,20 +4,14 @@
 import json
 from .common import API_URL
 
-def _email_file_from_path(path):
-  with open(path, 'rb') as file:
-    return {
-      'name': os.path.basename(path),
-      'content': base64.b64encode(file.read()).decode('utf-8')
-    }
-
 class _Email():
   def __init__(self, interceptor):
     self.path = '/email'
     self.interceptor = interceptor 
     
   def send(self, message):
-    message._add_files()
+    message._add_inlines()
+    message._add_attachments()
     r = requests.post(API_URL + self.path, auth=self.interceptor, data=message.to_json())
     data = r.json()
     if not 200 <= r.status_code < 300:
@@ -36,6 +30,22 @@ def __init__(self, to, sender, subject):
     self.attachments = []
     self.status = ''
 
+  def _add_inlines(self):
+    for inline in self.inlines:
+      with open(inline, 'rb') as file:
+        self._inlines.append({
+          'name': os.path.basename(inline),
+          'content': base64.b64encode(file.read()).decode('utf-8')
+        })
+  
+  def _add_attachments(self):
+    for attachment in self.attachments:
+      with open(attachment, 'rb') as file:
+        self._attachments.append({
+          'name': os.path.basename(attachment),
+          'content': base64.b64encode(file.read()).decode('utf-8')
+        })
+
   def _add_files(self):
     for path in self.inlines:
       self._inlines.append(_email_file_from_path(path))
diff --git a/labstack/log.py b/labstack/log.py
@@ -33,12 +33,13 @@ async def _schedule(self):
   async def _dispatch(self):
     if len(self.entries) == 0:
       return
-
-    r = requests.post(API_URL + self.path, auth=self.interceptor, data=json.dumps(self.entries))
-    if not 200 <= r.status_code < 300:
-      data = r.json()
-      raise LogError(data['code'], data['message'])
-    self.entries.clear()
+    try:
+      r = requests.post(API_URL + self.path, auth=self.interceptor, data=json.dumps(self.entries))
+      if not 200 <= r.status_code < 300:
+        data = r.json()
+        raise LogError(data['code'], data['message'])
+    finally:
+      self.entries.clear()
 
   def debug(self, format, *argv):
     self._log(Level.DEBUG, format, *argv)
diff --git a/labstack/store.py b/labstack/store.py
@@ -77,7 +77,8 @@ def __init__(self):
   def from_json(self, response):
     qr = StoreQueryResponse()
     qr.total = response['total']
-    qr.entries = response['entries']
+    for entry in response['entries']:
+      qr.entries.append(StoreEntry.from_json(entry))
     return qr
 
 class StoreError(Exception):
