Changeset 2c4c2e5b

Timestamp:

04/06/12 10:13:17 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test

Children:

e5778ef

Parents:

4fa6f4b

git-author:

yomguy <yomguy@…> (04/06/12 10:13:17)

git-committer:

yomguy <yomguy@…> (04/06/12 10:13:17)

Message:

increase streaming chunk size, fix mimetype for mp4 when editing

Location:

telemeta

Files:

• htdocs/images/item.png (modified) (previous)
• htdocs/images/item_title.png (modified) (previous)
• templates/telemeta/base.html (modified) (1 diff)
• views/base.py (modified) (3 diffs)

telemeta/templates/telemeta/base.html

@@ -65 +65 @@
 {% 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>

telemeta/views/base.py

@@ -102 +102 @@
 
 def stream_from_file(__file):
-    chunk_size = 0x10000
+    chunk_size = 0x100000
     f = open(__file, 'r')
     while True:
@@ -683 +683 @@
         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':
@@ -975 +978 @@
                     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