From: yomguy <yomguy@parisson.com>
Date: Fri, 6 Apr 2012 08:13:17 +0000 (+0200)
Subject: increase streaming chunk size, fix mimetype for mp4 when editing
X-Git-Tag: 1.4.3-2~29
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2c4c2e5bfe41c19bad9db29a7c1483974c2e683b;p=telemeta.git

increase streaming chunk size, fix mimetype for mp4 when editing
---

diff --git a/telemeta/htdocs/images/item.png b/telemeta/htdocs/images/item.png
index d1964f7c..3f173d50 100644
Binary files a/telemeta/htdocs/images/item.png and b/telemeta/htdocs/images/item.png differ
diff --git a/telemeta/htdocs/images/item_title.png b/telemeta/htdocs/images/item_title.png
index e0fafc0c..6afd789e 100644
Binary files a/telemeta/htdocs/images/item_title.png and b/telemeta/htdocs/images/item_title.png differ
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: