From 2c4c2e5bfe41c19bad9db29a7c1483974c2e683b Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 6 Apr 2012 10:13:17 +0200
Subject: [PATCH] increase streaming chunk size, fix mimetype for mp4 when
 editing

---
 telemeta/htdocs/images/item.png       | Bin 806 -> 742 bytes
 telemeta/htdocs/images/item_title.png | Bin 534 -> 495 bytes
 telemeta/templates/telemeta/base.html |   2 +-
 telemeta/views/base.py                |   7 ++++++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/telemeta/htdocs/images/item.png b/telemeta/htdocs/images/item.png
index d1964f7cc83410ffb02b38d0b4714a8612cd570b..3f173d505509488037a6873516e4ccdcc0b4fd2e 100644
GIT binary patch
delta 686
zcmV;f0#W^@2Id8jF%Je}OGiWi{{a60|De66laVeLe*gz`Nliru+yn#<6Ev93wRr#l
z0%l1>K~z}7?UzqT6mb;CKi{1hYa<W^=^zO~u%}=z1zidcLUazn5QHGsE$|RR5ClRX
zEOa$j4NrpLNfM#xAaoRhA}|C&5QHFD2$uCvGrkTcsp~kuSq(3~<1oMZe&73j-}k+d
znQ@kpf8mVd%nA679D1UQxgElrg6zIrzK+`VV%l%XRRaa7S@?rsy`YYm*D9d744Kj!
z+gv_10tGca74`~fc1&zr1lLEcwtk{3=$4vV3ChCyQk4}=?SXeo-i%q)kO*4|CP@hn
zRKXwGtz6LAg1=ahno|?#S1<_H(||@tMy<Bqf3M&+Fek_he=3y*in`Qp{9Xbsrv$Hf
zgx8E9w}X8=s2S@mTR81h0V90T062z*BAPlPZ2qud4ZZA^yhH-eq^zaCcMMj979e^r
zXsZ_{xfc98iCs{`>pW;Mv5>2VCPBZ1^$2Dmng_MVcL!a-!m$Jl<&~W6vQKnt#H_j}
zf4riC*A{P3dj#@{SD<4u*hitX4;+Aiu;g$}R}%>scn(&xcKFE;s5lVMCKAYSFteDr
zS8rP0eTOcoBoc_QrDUsRpeX<Gzv&p<H7Gk+^!G#~Dk$3_!d1uC+W@LZwO!1KIy0)P
zz?f~U8GLaYI%M6!i9(_ej!tMLPCYd7f7YzxL}1*)8H3NKh+Y-`aH?tO<2}TwwOq7f
zeR0c4EP)Z*T*<(L-T8i^cs^#~Y{M&AK^Ja_=p6|*dsK%Q_GsL~nG>z$W486pi1NU&
zdo?ue<K>gUQ*Ffn15(=-L65L5gDZcBiw7(j{LH{7;Z3`4#Hk6K|C*f>_#g2H6f)oB
Uqg<bQ^8f$<07*qoM6N<$g7cp{ApigX

delta 752
zcmV<M0uTM>1*Qg&F_A+Qe*()%L_t(o!|hjHNK;`Le%#7sJD?mI=1-zHHa4j3q8Ubo
zUX+qfM^H?XeniRgHj{{KAZCF`nAU|MDE>m-1Z6R4W`X4>6fK!X#pZ-D7%m2fw7ISv
z+4+v&IaBe*=k9!*_kEx5{hseR?}>{<A`xsOWY}hGJAqxX1o>REfB5NiVwvNjYv~39
zGILB@M}P|kVQ+51$DUpU+#cdPN|wbTb1@3)YLTqfh{_u$Mua2nkMaEW9dN;*xLw7^
zqv4wiNolDY>%gC-CG=I-V63ZKQd^IdpN|$_35Ow*%VQH^cSV)t;tGaAv8^5e;Bt(h
zDJOT`&IuB*H@Cpqe?K5uRCzU5k(8E-?_(d(Znj{4ViKL@7o}-n(YpYf{vdvbLXwIr
zSr&~y=HPS9;=#$nH9N29>4K@uDy{=Vckf9q4gkfrdIa1aJS-~Vwf#jyBUZv;I)P=5
zlYH&~pi*Z;o1cf)!qW)({Y3AW8+}K=1un<P8iNtSzN}0ff33KTgv3NR`v+jOl%lQ3
zj79H)V9bnt7~1^2^$B<;CaJ}fwHn+UAA^EnqQZN2{f3}Htzw>#TSgKf4Fz?z(c=HE
z(Gc)>=mbbY`5$aX25)UI%TnV=N6RCyhfz`!eR=how>JH9h#E&C$s@2|ucIb%w6@`W
z$CK#u+}ly~e^y_k#--?VbR!D5J-C&n7IpP@CnP|@FvM#|0?CYI{PR74bfZC3!ex#V
zU0f!YLtk)8oD+&sv{W3cs)UlD0l|5oDJK{1PoFoXxPoC|`#MFO4+Ou4m3=)##<Ad1
zSEt}`B3sYfuRI;(8IDw(x!(k%r8M@D%sVxWM<o`jX3dgr$c4@h96on;<1^vvK>DV&
zP1I-FRAz<QRu7drdvk`;RfPP0jQ0;>#y*T+J|E^MCb1F@BSo(Rqf$Y0;y6rYR?!o&
iWCA<CW;+D70)GMdq8G;-zD&aa0000<MNUMnLSTY!lV|Jz

diff --git a/telemeta/htdocs/images/item_title.png b/telemeta/htdocs/images/item_title.png
index e0fafc0c3f16dfdb0a68dc226c46cc6d6c311174..6afd789eac08d4d6f158581e48265e44a2b80029 100644
GIT binary patch
delta 424
zcmV;Z0ayN(1n&coHwpg${{a7>y{D6rKpubG1OyKh5bKY}ZvX%RZ%IT!R5;7Ul+P<f
zQ545N=gzw?nv{`^;(w6U_zNUi5F2R-%}PoZlCrk56e(e0p`<7)n<+Lzv68Y<*q9=}
zX5P%PF=6g|V;0I;-R?PkI^Xk4RF%Il!ylPf$(a(b*F&2D6v?h?un`q2VbVq<HsOC`
z=77Zae}&vDnp)Rj>sM)M@z;FJLOBFL;Q5Zi;egooil7mR%@}krD*XWF>!G<0-ARkx
ziv(HBOcbPuUOy6K8t}FSX*AH860h4S_ON)PHAuW1pm3~kTSQJ0*e%eelCK8S2kidH
z$j7w0S#YqV`Q)<Zdw{%rcJQla+U9>qQ;3IvE=unldKJ=i-;q{CZ({C{4ULL_8Bn~h
zMP^;udgFlJAY-9CIAPI6i-b0y0GZH%Op84<kgRemvgZUXN2;$*`=5|;AX^RP9i1#e
z9MGob&K?Ll6gjQHxP3wU%lA&A&d8Y9X#-uKQe%o-7SR0_%}-UmwEudKJ^&QlI)!5G
Sj*7zo0000<MNUMnLSTYFZp~T%

delta 463
zcmV;=0WkjW1C|7kHwgd$0002_L%V;GKpubF1q%)g4Rcmdh5!HomPtfGR5;6H{Qv*|
ze+DW5CI%`27JQOt)~#pw@Z<>t0|NsCm!KenRcs7SwT#%jwrA30hV4zQ4By_rM-gXc
zV`GS0G@rpNG=#9%=Eo;7tSv0TFoc1Dfq|Wyn?c#yisAP06Zj3<+TOu%YROWZ&Ub&S
zC}Vj4<O##ffFOp+KK{53+ST5L(-2`LMFwR%8-_VSVGLj2yk)qyeFww&&08=7`_SBZ
z48Oj9#V|nL)P#XgQj$T=*oa|nXe7hO=g;AC7uKv}F!c37b<xucmoN-bcXnc^IB}FA
zYyBDqW>!{s48p*pbLTL<_7jV1q;!9E;A~M<6%6^mzkXwSO+ZE(L*dDViy6e#)fsrj
z#Ta(BwqwX6>wz1jVrPq?_}lyU3@b9TaYlfOoh|kR*=cRZ@ZiKrqOt^+pddrr<NFNk
zoSc}^A3kLg1DBv6Q3eI~_rMLoFi64BfFXP5Rt8xkBb)~COG+{%uU>(X?-)CA6(id_
zyBV%*-Nx|X#7TyKfB!OwtE)3;dAc)%^>!1VX$Q1C0suEzh{jl7$eaKG002ovPDHLk
FV1jx(*{%Qp

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 8c18d4ba..9439f7f8 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -64,7 +64,7 @@
 <img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a>
 {% else %}
 <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
-<a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
+<a href="{% url telemeta-login %}">{% trans "Sign in" %}</a>
 {% endif %}
 </div>
 
diff --git a/telemeta/views/base.py b/telemeta/views/base.py
index e1e64226..28bfe7cf 100644
--- a/telemeta/views/base.py
+++ b/telemeta/views/base.py
@@ -101,7 +101,7 @@ def stream_from_processor(__decoder, __processor, __flag, metadata=None):
         yield __processor.chunk
 
 def stream_from_file(__file):
-    chunk_size = 0x10000
+    chunk_size = 0x100000
     f = open(__file, 'r')
     while True:
         __chunk = f.read(chunk_size)
@@ -682,6 +682,9 @@ class ItemView(object):
 
         previous, next = self.item_previous_next(item)
         mime_type = self.item_analyze(item)
+        #FIXME: use mimetypes.guess_type
+        if 'quicktime' in mime_type:
+            mime_type = 'video/mp4'
 
         if request.method == 'POST':
             form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
@@ -974,6 +977,8 @@ class ItemView(object):
                 except:
                     pass
             response = HttpResponse(stream_from_file(audio), mimetype = mime_type)
+#            fsock = open(audio, 'r')
+#            response = HttpResponse(fsock, mimetype = mime_type)
         else:
             media = self.cache_export.dir + os.sep + file
             if not self.cache_export.exists(file) or not flag.value:
-- 
2.39.5