fix ogg and video player

Conflicts:
	timeside/server/templates/timeside/item_detail.html

diff --git a/timeside/server/management/commands/timeside-tests-boilerplate.py b/timeside/server/management/commands/timeside-tests-boilerplate.py
index 2830773f95024e3b5463d8d42f6756746158c564..3cb3a7d5aeb5d8ebe38e1c6edba9f29a32dab823 100644 (file)
--- a/timeside/server/management/commands/timeside-tests-boilerplate.py
+++ b/timeside/server/management/commands/timeside-tests-boilerplate.py
@@ -57,6 +57,6 @@ class Command(BaseCommand):
             if not preset in experience.presets.all():
                 experience.presets.add(preset)
 
-        task, c = Task.objects.get_or_create(experience=experience, selection=selection)
+        task = Task(experience=experience, selection=selection)
         task.status_setter(2)
         task.delete()

diff --git a/timeside/server/templates/timeside/item_detail.html b/timeside/server/templates/timeside/item_detail.html
index 605a39f31299821aaf97a8c35cd637ae27cc2029..3139f68f400c0bd84159a650e033c314bf4b4e7f 100644 (file)
--- a/timeside/server/templates/timeside/item_detail.html
+++ b/timeside/server/templates/timeside/item_detail.html
@@ -32,7 +32,26 @@ Results:
 
 <ul>
 {% for result in object.results.all %}
-  <li><a href="{% if 'image' in result.mime_type %}{% url "timeside-result-png" result.id %}{% elif 'audio' in result.mime_type %}{% url "timeside-result-audio" result.id %}{% else %}{% url "timeside-result-json" result.id %}{% endif %}">{{ result.preset.processor }}</a> ({{ result.uuid }})</li>
+    <li>{{ result.preset.processor }} ({{ result.uuid }})
+    {% if 'image' in result.mime_type %}
+        <img src="{% url "timeside-result-png" result.id %}">
+    {% elif 'audio' in result.mime_type or 'ogg' in result.mime_type%}
+     <br>
+     <audio controls>
+        <source src="{% url "timeside-result-audio" result.id %}" type="{{ result.mime_type }}">
+     </audio>
+    {% elif 'video' in result.mime_type %}
+     <br>
+     <video controls>
+        <source src="{% url "timeside-result-audio" result.id %}" type="{{ result.mime_type }}">
+     </video>
+    {% else %}
+        <a href="{% url "timeside-result-json" result.id %}">JSON</a>
+            <button id="add-data">add</button>
+        <br>
+        <div id="graph-{{ result.id }}" class="timeline" json="{% url "timeside-result-json" result.id %}"></div>
+    {% endif %}
+    </li>
 {% endfor %}
 <ul>