From 3abddc6e0c127c4397bc62011b275b1ae5ddd5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sat, 11 Jun 2016 13:53:22 +0200
Subject: [PATCH] misc: return correct mimetype for thumbnailed files (#11307)

---
 tests/test_form_pages.py | 29 +++++++++++++++++++++++++++++
 wcs/forms/root.py        |  1 +
 2 files changed, 30 insertions(+)

diff --git a/tests/test_form_pages.py b/tests/test_form_pages.py
index 292ec83..3851c3e 100644
--- a/tests/test_form_pages.py
+++ b/tests/test_form_pages.py
@@ -11,6 +11,11 @@ import base64
 from webtest import Upload
 import mock
 
+try:
+    from PIL import Image
+except ImportError:
+    Image = None
+
 from quixote.http_request import Upload as QuixoteUpload
 from wcs.qommon.form import UploadedFile
 from wcs.qommon.ident.password_accounts import PasswordAccount
@@ -1493,6 +1498,30 @@ def test_form_file_field_submit(pub):
     assert resp.content_type == 'text/plain'
     assert resp.body == 'foobar'
 
+def test_form_file_field_image_submit(pub):
+    formdef = create_formdef()
+    formdef.fields = [fields.FileField(id='0', label='file')]
+    formdef.store()
+    formdef.data_class().wipe()
+
+    image_content = open(os.path.join(os.path.dirname(__file__), 'image-with-gps-data.jpeg')).read()
+    upload = Upload('test.jpg', image_content, 'image/jpeg')
+
+    app = get_app(pub)
+    resp = app.get('/test/')
+    resp.forms[0]['f0$file'] = upload
+    resp = resp.forms[0].submit('submit')
+    assert 'Check values then click submit.' in resp.body
+    assert '<img alt="" src="tempfile?' in resp.body
+    tempfile_id = resp.body[resp.body.index('tempfile?'):].split('&', 1)[0].split('=')[1]
+
+    resp = app.get('/test/tempfile?t=%s' % tempfile_id)
+    assert resp.body == image_content
+
+    if Image: # check thumbnailing
+        resp = app.get('/test/tempfile?t=%s&thumbnail=1' % tempfile_id)
+        assert resp.content_type == 'image/png'
+
 def test_form_file_field_submit_wrong_mimetype(pub):
     formdef = create_formdef()
     formdef.fields = [fields.FileField(id='0', label='file')]
diff --git a/wcs/forms/root.py b/wcs/forms/root.py
index 670e08a..bb04431 100644
--- a/wcs/forms/root.py
+++ b/wcs/forms/root.py
@@ -1023,6 +1023,7 @@ class FormPage(Directory):
             except IOError:
                 # too bad we couldn't load the image, return the whole file :/
                 return file_pointer.read()
+            response.set_content_type('image/png')
             return image_thumb_fp.getvalue()
         else:
             return file_pointer.read()
-- 
2.8.1