Switched the ordering of transcodes so transcodes are preferred. Made the...

Switched the ordering of transcodes so transcodes are preferred. Made the regular template tag use the method from the model

wagtailvideos/models.py

@@ -244,13 +244,15 @@ class AbstractVideo(CollectionMember, TagSearchable):
         if self.thumbnail:
             attrs['poster'] = self.thumbnail.url
 
-        mime = mimetypes.MimeTypes()
-        sources = ["<source src='{0}' type='{1}'>"
-                   .format(self.url, mime.guess_type(self.url)[0])]
-
         transcodes = self.transcodes.exclude(processing=True).filter(error_message__exact='')
+        sources = []
         for transcode in transcodes:
             sources.append("<source src='{0}' type='video/{1}' >".format(transcode.url, transcode.media_format.name))
+
+        mime = mimetypes.MimeTypes()
+        sources.append("<source src='{0}' type='{1}'>"
+                       .format(self.url, mime.guess_type(self.url)[0]))
+
         sources.append("<p>Sorry, your browser doesn't support playback for this video</p>")
         return mark_safe(
             "<video {0}>\n{1}\n</video>".format(flatatt(attrs), "\n".join(sources)))

wagtailvideos/templatetags/wagtailvideos_tags.py

@@ -39,16 +39,4 @@ class VideoNode(template.Node):
         if not video:
             raise template.TemplateSyntaxError("video tag requires a Video object as the first parameter")
 
-        if video.thumbnail:
-            self.attrs['poster'] = video.thumbnail.url
-
-        mime = mimetypes.MimeTypes()
-        sources = ["<source src='{0}' type='{1}'>"
-                   .format(video.url, mime.guess_type(video.url)[0])]
-
-        transcodes = video.transcodes.exclude(processing=True).filter(error_message__exact='')
-        for transcode in transcodes:
-            sources.append("<source src='{0}' type='video/{1}' >".format(transcode.url, transcode.media_format.name))
-        sources.append("<p>Sorry, your browser doesn't support playback for this video</p>")
-        return mark_safe(
-            "<video {0}>{1}</video>".format(flatatt(self.attrs), "\n".join(sources)))
+        return video.video_tag(self.attrs)