From a3119555347f9cf9635a2979c9fb7343d3416afe Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 23 Sep 2015 01:34:08 +0100
Subject: [PATCH] Add system check for libjpeg / zlib

---
 wagtail/wagtailimages/apps.py                 |   2 +
 wagtail/wagtailimages/check_files/wagtail.jpg | Bin 0 -> 1160 bytes
 wagtail/wagtailimages/check_files/wagtail.png | Bin 0 -> 849 bytes
 wagtail/wagtailimages/checks.py               |  58 ++++++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 wagtail/wagtailimages/check_files/wagtail.jpg
 create mode 100644 wagtail/wagtailimages/check_files/wagtail.png
 create mode 100644 wagtail/wagtailimages/checks.py

diff --git a/wagtail/wagtailimages/apps.py b/wagtail/wagtailimages/apps.py
index 88cd6e3f0..3b5a61900 100644
--- a/wagtail/wagtailimages/apps.py
+++ b/wagtail/wagtailimages/apps.py
@@ -1,5 +1,7 @@
 from django.apps import AppConfig
 
+from . import checks
+
 
 class WagtailImagesAppConfig(AppConfig):
     name = 'wagtail.wagtailimages'
diff --git a/wagtail/wagtailimages/check_files/wagtail.jpg b/wagtail/wagtailimages/check_files/wagtail.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..58d26fba22deb864bcc85ff2d80a63d94fe5aeb6
GIT binary patch
literal 1160
zcmex=<NpH&0WUXCHwH#VMusRLWcYuZ!I^=Xi3x;&fCY$HIapa)SXjB(+1WUFxOjND
zxwyG``Gf>``2_j6xdp@o1cgOJMMZh|#U;c<B!omnML>oyG6VInuyV4pa*FVB^NNrR
z{vTox<Y3TXP+(>hWMC3xWEN!ne}qAbfsuh32oZpTftj6^jT0y*0`vqL_<xImhnbOq
zNq|{^fq^k(PDGNx@odh<KjE_(pFK=Cs%@+sX5R2ak;56NU0#5Jkp<{&gb}PjPq4EA
zZ5I$00h+`CG@p@`>7kQPhiup1X^9!Ki<$jmX1Z^@@Z_X()h4r@H8vfOBVJ@~mQ~cV
zo8eU=yx8&fh21`KM-8$Qv=k4=xm+^3vS!tZ&mgA?qC3?AYymSPqdlWK9tBJ=1x7&E
zGBdI<a&W`k%LH_-AOowAqM@U(fKp&$;lza(MHGyjf*PAPZaVk@>H#);rY)VDxVd%O
zls;{_8Q$}f$FbkXP<h9qnb$fWuG^OPPRXp*pQUKhH`VHz&FiAlPux9m@Uv5&$D;S|
z`rq%m!@Vo|V(%xx#eNA#cGtdD(GQcHsV3AX$+xY`OEq5GbKbX%8=sx_-OQO*<^B9f
z<)vVwm(kis*NV5zUiIbAnm^ZD9hObfQ2N8U=*QZH>`SI8mr5rI@a65=z3O_(tNZIt
zEY;$!57hc+CMn*$w901YLzBg|xBoMwo)DVX^SeCsmg)g>=@4;luSMUU-_U$j4-6(H
z0brB>BMlL2z{CO!0HE(11r#POg!!7$UUAWp%YGHIYZy-j)^+Z;+IV2O>N;2LT`WaD
zSvy`_N%`^3#Jc$4?}A0AcD&v(TV3a~W8};Zh1*K+Z|=Sl5wpTO`O`nnQqP+OH%^Be
zxrqv>cTRb$JmbdND6{MN>truxDb=juIpol@`I5~!$Nh7!+X~0;T)&&|1p^Cf!-^HW
zx}Mxd59J+Ui4mN91)4Zj7#LWD{P9FKC^ZNWN)2EIvI4*yjFK}L1r-^9;h>P%2ur#4
z0#A<lGOJITdhdeV?~@M&HZAdD3};}Qe97_*7egqk$TR<&YDc>-@no#;cbsroLy1E%
zMC+@F+<l%ux|&|1x!W$h&{*o|_(8DDVA<A`Hr4_Ig~WrdE-oDYN`C})zpJgD@-`~M
z?r8J0sXN&snorE+Xm9$)`8$JC|AhUVNeS#q9Zx2?tA26tN#J07z?Zzj^n_Ax>Q=UY
I^8arF04o$@P5=M^

literal 0
HcmV?d00001

diff --git a/wagtail/wagtailimages/check_files/wagtail.png b/wagtail/wagtailimages/check_files/wagtail.png
new file mode 100644
index 0000000000000000000000000000000000000000..0597e9d90a5d2b39e698b376c5a97652438c58ef
GIT binary patch
literal 849
zcmV-X1FrmuP)<h;3K|Lk000e1NJLTq001BW001Zm1^@s6pDFm600006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-w75ME-ZIwzES`H0^UhP
zK~z}7#h6cM6G0Tlza5k2PZe$5NZNo|-H62;jH!YZs!)39#iKOmB2usyL2~e*p$D;`
z9(yU?#7eE`C8t0ts6|f}tcayha)>A*Nen5r+2ncIK-^AJXR=)%>}6(me&2iZ-poq?
zdrbjw9>8?~_W?Wra1+4D?Ch);du(R`Yy%+Pv$3&JBchP?BbQC^834)VfuW%xV`5?g
zs;bskR#uqb@81XD3lSXwu&F4DZJv)?y<J#Xs8VZtZfDq!Tj6tabK5-XtEDB%=kr8F
zn|2C#*$h`zwQd;34tTv@r#>}6)2UQrNZS+d2L=Y}wOWlE_o^wZR4UQAGw~+?pog`N
z$}J}%pkawC<5fMZksj9OJE?*gfTPyIVzCIuSj&&5@1$0j-@d83-EIJg>S1k0HUi&x
zwayr$(a}-Tb)7<?5Dg9vQZkvOwY9ZI0OEG+{nb{7O}i(X%@Pq^vqQiS83Cq<N1ej&
z$-)6pG#Xv)1bzTOSp?|w`FP{f_E6O0OeV9d0QQgYV*qZ5sP%fi$mMdpDVL0ZlxVmD
zfdJC!G;hifT`MA!aPfGY+-|pZd`ol-6ab4d2{SxA48z#r?2@Q}lK@VO!u$LCQK?iw
zv?J#pi>_6a3IF8eWUIN52s|MJpPHJY-rio`obV}_7XiCmE*cvfBgPnS{;Mebt_a-Y
z@lYa>X!nlRF3Vf({lQ)9GZH~hPY()(0@l~pd9RR}#2-alY_2C=U0vk!`6w6+QY;pu
z?(Xh(UcZxRcr@N(ilUI;?<d9>DT=b&mKXpo%3e6n0DK4V6u<|;3YZ6QNv65{>ka|%
zyJ`P;RtE6XY|B0YcmW`7_wT$$zh5>R&<KG2aL7F7r9l90<3HG<9o>tpooa%=b^>U<
z4R2ZUz)?G4DXT+H3s`P~XPk!jS-c-{TEJ(^QF_=(_yrSOGwc7olW>>$N5f?^3cmmp
boD}c}Hy%TsNJV*~00000NkvXXu0mjfI?aE+

literal 0
HcmV?d00001

diff --git a/wagtail/wagtailimages/checks.py b/wagtail/wagtailimages/checks.py
new file mode 100644
index 000000000..c4aafcf22
--- /dev/null
+++ b/wagtail/wagtailimages/checks.py
@@ -0,0 +1,58 @@
+import os
+
+from django.core.checks import register, Warning
+
+from willow.image import Image
+
+
+def has_jpeg_support():
+    wagtail_jpg = os.path.join(os.path.dirname(__file__), 'check_files', 'wagtail.jpg')
+    is_ok = True
+    f = open(wagtail_jpg, 'rb')
+
+    try:
+        Image.open(f)
+    except (IOError, Image.LoaderError):
+        is_ok = False
+    finally:
+        f.close()
+
+    return is_ok
+
+
+def has_png_support():
+    wagtail_png = os.path.join(os.path.dirname(__file__), 'check_files', 'wagtail.png')
+    is_ok = True
+    f = open(wagtail_png, 'rb')
+
+    try:
+        Image.open(f)
+    except (IOError, Image.LoaderError):
+        is_ok = False
+    finally:
+        f.close()
+
+    return is_ok
+
+
+@register()
+def image_library_check(app_configs, **kwargs):
+    errors = []
+
+    if not has_jpeg_support():
+        errors.append(
+            Warning(
+                'JPEG image support is not available',
+                hint="Check that the 'libjpeg' library is installed, then reinstall Pillow."
+            )
+        )
+
+    if not has_png_support():
+        errors.append(
+            Warning(
+                'PNG image support is not available',
+                hint="Check that the 'zlib' library is installed, then reinstall Pillow."
+            )
+        )
+
+    return errors