Merge pull request #67 from thenewguy/issue-65

Fix issue 65

Author: zerolab

README.md

@@ -113,7 +113,8 @@ Here is an example:
 from __future__ import unicode_literals
 
 from django.db import models
-from django.utils.html import format_html
+from django.forms.utils import flatatt
+from django.utils.html import format_html, format_html_join
 
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.fields import StreamField
@@ -132,7 +133,7 @@ class TestMediaBlock(AbstractMediaChooserBlock):
             player_code = '''
             <div>
                 <video width="320" height="240" controls>
-                    <source src="{0}" type="video/mp4">
+                    {0}
                     Your browser does not support the video tag.
                 </video>
             </div>
@@ -141,13 +142,16 @@ class TestMediaBlock(AbstractMediaChooserBlock):
             player_code = '''
             <div>
                 <audio controls>
-                    <source src="{0}" type="audio/mpeg">
+                    {0}
                     Your browser does not support the audio element.
                 </audio>
             </div>
             '''
 
-        return format_html(player_code, value.file.url)
+        return format_html(player_code, format_html_join(
+            '\n', "<source{0}>",
+            [[flatatt(s)] for s in value.sources]
+        ))
 
 
 class BlogPage(Page):

wagtailmedia/models.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import mimetypes
 import os.path
 
 from django.conf import settings
@@ -80,6 +81,13 @@ def file_extension(self):
     def url(self):
         return self.file.url
 
+    @property
+    def sources(self):
+        return [{
+            'src': self.url,
+            'type': mimetypes.guess_type(self.filename)[0],
+        }]
+
     def get_usage(self):
         return get_object_usage(self)
 

wagtailmedia/tests/test_models.py

@@ -1,7 +1,11 @@
 from __future__ import unicode_literals
 
+from django.core.files import File
+from django.core.files.base import ContentFile
 from django.test import TestCase
 
+from six import b
+
 from wagtailmedia import models
 from wagtailmedia.forms import get_media_form
 
@@ -53,3 +57,25 @@ def test_audio_form_presents_thumbnail(self):
         MediaForm = get_media_form(models.Media)
         media = models.Media.objects.create(title="Test media file", type='audio', duration=100)
         self.assertIn('thumbnail', MediaForm(instance=media).fields.keys())
+
+
+class TestAbstractMediaInterfaceModel(TestCase):
+    def test_sources_mp4_type(self):
+        fake_file = ContentFile(b("A boring example movie"))
+        fake_file.name = 'movie.mp4'
+        media = models.Media()
+        media.file = File(fake_file)
+        self.assertEqual(media.sources, [{
+            'src': '/media/movie.mp4',
+            'type': 'video/mp4',
+        }])
+
+    def test_sources_unknown_type(self):
+        fake_file = ContentFile(b("A boring example movie"))
+        fake_file.name = 'movie'
+        media = models.Media()
+        media.file = File(fake_file)
+        self.assertEqual(media.sources, [{
+            'src': '/media/movie',
+            'type': None,
+        }])