From b13e5fc15fe845059a0168ae42b25f58dfc62ee8 Mon Sep 17 00:00:00 2001
From: Trever Fischer <tdfischer@fedoraproject.org>
Date: Wed, 7 Mar 2012 17:08:41 -0500
Subject: [PATCH] Return default minecraft skin for unknown skins. Fixes #11

---
 minecraft/static/skin.png | Bin 0 -> 1360 bytes
 minecraft/views.py        |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 minecraft/static/skin.png

diff --git a/minecraft/static/skin.png b/minecraft/static/skin.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cfa08a869366adf395cc443c14a5f59ecfb92d3
GIT binary patch
literal 1360
zcmV-W1+V&vP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00004XF*Lt006O%
z3;baP0000ObVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGeWspsM)000EzNkl<ZXhY?f
z-)mGy6vwZKQcYrwv>2ks9~<MEM%MU)Vnkz&zY&X(ikhOLqA@WDi&jv?_=9RHRG$J$
zv`{EWQGD<hBKEOQdFg*snup_j&+hm3WSqM<(Zvn%!eQploVh#S&zw0kJ0(hanitdv
zT>cvwiKb7RrrxOI8Tof=wEx@2l3%#}`kyIjzcHcv0idz&3&}0~QjPCugPq@=lb%g0
z<>!5C;u3YV!zQ%2u}ltvDZZ(GW+H%0CL`7WWl{j(>T~5$5(-L2z@!CW#UcV=b~}6)
z006-k&wP*spflSvIko`BL-6wX)e2(a?5a2+5&-tRZ<8Vi004zE3YZL;1DNqc<yaDJ
zMSZgKW(o|Vmd&eDv8yt(WyPX`<rdY*Hw}f8AUnTGk3RUK4FKqeF&K+)pr7Am(!@Ah
z$2%gaqT=!6762yR(lASfK;Y`eS}kdK-`qS$+MB;tKLDW*#-NQ+VgZ!8M^qeuPP(qJ
zY6am=m|MlhI=<J)%YifU_Sd}pJ=iaAZ|7b8oIL*NkgQocN5{YyV=y+}F7BK7cG^9n
z;sA7|>Rl)=m{nL+_l__|J-4J*{=9rrp5N%x@=1T64CQ~6Hv@SYI=x#BKJdjDj71&a
z!Z-1rc8{1C0OCAQEt$D9<mQ1k89KgI+Ol7%cs!jO2IR%1Qz{;HJb(fp_+kvkHq}?h
z`yT+(?hz9QfLk$ag_ed|xzX7wgGauTTZh&;aognCrDO8yT0TDJ{<?KWe(%{X{qD{W
zANXPn#^M`XeF7+TkEl2RhCRaeSVvAC^n5S(k8jaGH#pYr9`0}gH_3&~Ye(6g!yD!5
zzIEyYUyQ+6d_%WDaXX~lBPtF6lcxZbL#KA=ivDtNy`0;Tle1e}q_3k{#lkM`SuNLp
zSg(dUeBk?A_f8#q|HQ6BS%gTC_6~tM!Brf9KY{%_hs9bpn-y!R6CNIp{|fsTqsa9|
zM~{}av>$l%Nc1}}SI6yhZ|l;yOdFosUk(7FYcbl&0)XO+<>w8+MSxv>h5WHkIU*qG
zzd>0dz}o^J4Pa$9FR-S?U0QBy`(u>ZKEJ=MbwHvkSN^xIE{X2lljz|?O_(?;nLN>^
zX8ln|8${8bK9vZ@_auM%`28HuGA$w~@IwFqmI~_bE*R>Zco6~ss7Ox8`eO|I{YhH@
z{5HSOK9mG%fB!=PFcQWS0SX{AK~54AL_}DT)*tndcpC*Fz;=w^|H%O$>?sO$I{^Z)
zZAtzBMR2z63$)SnsUpDU0qlEgDjuR}m^=kQ5bJEWz66E{2?229aVewSbeAvu|FDKO
z>*M#QrGO}u<R}m!?&pa209ZkQVF84MSzz1(p)tj669O=Jwkw8!ehZ;20Bjy8bqd5e
zfDj0PA#e9TVGsbfjSYL|3IoK7V+0TY$`Al;FG3nq1TX=P_ZSSG0)F^Y6ao0BKnPX>
z0Eo3K>;njGk+J|N1?atF&?Y?p1i*V**7mYEBY<THK&c#&3ZT8cU0|h-LG;nDx3^cU
z#e#St;p+L}&xGg$u>SNh3DJu4BLFaLj$pstB4Y-SB#`Y%{WeG7GUeYR@UAyT0|0*Z
z;>E<O_k|)5v|(%#0E!GnNW}nzatMJa1Sc-_YVCY1M1O@xB|w+xLdW2E0K5YaPTyvQ
S1d8VX0000<MNUMnLSTYvC~@on

literal 0
HcmV?d00001

diff --git a/minecraft/views.py b/minecraft/views.py
index e5310e4..e0e2829 100644
--- a/minecraft/views.py
+++ b/minecraft/views.py
@@ -6,12 +6,18 @@ from django.core.cache import cache
 from django.views.decorators.cache import cache_control
 from django.shortcuts import render_to_response
 from django.template import RequestContext
+from django.template.loader import select_template
 import models
+import os
 
 def avatar(request, username):
     avatar = cache.get('minecraft-avatar-%s'%(username))
     if avatar is None:
-        imgStream = StringIO(urlopen("http://minecraft.net/skin/%s.png"%(username)).read())
+        try:
+            skinStream = urlopen("http://minecraft.net/skin/%s.png"%(username))
+        except IOError, e:
+            skinStream = open(os.path.dirname(__file__)+"/static/skin.png")
+        imgStream = StringIO(skinStream.read())
         img = Image.open(imgStream)
         img = img.crop((8, 8, 16,16))
         img = img.resize((64, 64), Image.NEAREST)