]> www.vanbest.org Git - motioneye-debian/commitdiff
Fix mime type for video downloads
authorGavin <gavin.redshaw@maurent.com>
Sun, 4 Feb 2018 14:40:51 +0000 (06:40 -0800)
committerGavin <gavin.redshaw@maurent.com>
Sun, 4 Feb 2018 14:40:51 +0000 (06:40 -0800)
Make videos have mime type specific to the respective format instead of video/mpeg
Addresses:
- https://github.com/ccrisan/motioneye/issues/740
- https://github.com/ccrisan/motioneye/issues/775

motioneye/handlers.py [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index d69db8e..4fe9125
@@ -19,6 +19,7 @@ import datetime
 import hashlib
 import json
 import logging
+import mimetypes
 import os
 import re
 import socket
@@ -1521,7 +1522,7 @@ class MovieHandler(BaseHandler):
             content = mediafiles.get_media_content(camera_config, filename, 'movie')
             
             pretty_filename = camera_config['@name'] + '_' + os.path.basename(filename)
-            self.set_header('Content-Type', 'video/mpeg')
+            self.set_header('Content-Type', mimetypes.guess_type(filename)[0] or 'video/mpeg')
             self.set_header('Content-Disposition', 'attachment; filename=' + pretty_filename + ';')
             
             self.finish(content)
@@ -1533,7 +1534,7 @@ class MovieHandler(BaseHandler):
                             'url': remote.pretty_camera_url(camera_config), 'msg': error}})
 
                 pretty_filename = os.path.basename(filename)  # no camera name available w/o additional request
-                self.set_header('Content-Type', 'video/mpeg')
+                self.set_header('Content-Type', mimetypes.guess_type(filename)[0] or 'video/mpeg')
                 self.set_header('Content-Disposition', 'attachment; filename=' + pretty_filename + ';')
                 
                 self.finish(response)