Set width and height on camera responses. Fixes #7

ENTS-Source · Feb 2, 2017 · 0137e65 · 0137e65 · turt2live · Feb 3, 2017
1 parent fcee36c
commit 0137e65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/plugins/cameras.py b/plugins/cameras.py
@@ -1,10 +1,11 @@
 from neb.plugins import Plugin
 from neb.engine import KeyValueStore
 from requests.auth import HTTPBasicAuth
-from io import StringIO
+from PIL import Image
 
 import logging as log
 import requests
+import io
 
 
 class CameraCheckPlugin(Plugin):
@@ -65,16 +66,19 @@ def get_image(self, shortcode):
         apiInfo = self.store.get("api")
         url = apiInfo["base_url"] + "/image/" + shortcode + "?q=40"
         result = requests.get(url, auth=HTTPBasicAuth(apiInfo["username"], apiInfo["password"]), stream=True)
-        #capture = Image.open(StringIO(result.content))
+        capture = Image.open(io.BytesIO(result.content))
         response = self.matrix.media_upload(result.content, "image/jpeg")
+        log.debug(response)
         if "content_uri" in response:
             return {
                 "msgtype": "m.image",
                 "url": response["content_uri"],
                 "body": shortcode + ".jpg",
                 "info": {
                     "mimetype": "image/jpeg",
-                    "size": len(result.content)
+                    "size": len(result.content),
+                    "w": capture.width,
+                    "h": capture.height
                 }
             }
         else:

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 humanize
 pika
+pillow