Skip to content

Commit

Permalink
Merge pull request #62 from jkevingutierrez/patch-2
Browse files Browse the repository at this point in the history
Fix mimetype when the URL has params
  • Loading branch information
seb-b authored Feb 16, 2021
2 parents 155f739 + 5d07cbe commit 100e43d
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions wagtailvideos/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ def filename(self, include_ext=True):
def file_ext(self):
return os.path.splitext(self.filename())[1][1:]

@property
def content_type(self):
mime = mimetypes.MimeTypes()
return mime.guess_type(self.url)[0] or mime.guess_type(self.filename())[0]

def is_editable_by_user(self, user):
from wagtailvideos.permissions import permission_policy
return permission_policy.user_has_permission_for_instance(user, 'change', self)
Expand Down Expand Up @@ -200,9 +205,8 @@ def video_tag(self, attrs=None):
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]))
.format(self.url, self.content_type))

sources.append("<p>Sorry, your browser doesn't support playback for this video</p>")

Expand Down

0 comments on commit 100e43d

Please sign in to comment.