Merge branch 'master' of https://github.com/ccrisan/motioneye into movie-playback

diff --cc motioneye/handlers.py
index cc22323b0a9ce270d5cf152015dbb58c7b6aceaf,4fe9125f47fb925ceb27bf54b9c0967c23cb5ab5..0cbaa6282bed2abf4acd4f0727809311895f7659
--- 1/motioneye/handlers.py
--- 2/motioneye/handlers.py
+++ b/motioneye/handlers.py
@@@ -1470,10 -1533,10 +1532,10 @@@ class MovieHandler(BaseHandler)
                      return self.finish_json({'error': 'Failed to download movie from %(url)s: %(msg)s.' % {
                              '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')
+                 pretty_filename = os.path.basename(filename)  # no camera name available w/o additional request
+                 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)
  
              remote.get_media_content(camera_config, filename=filename, media_type='movie', callback=on_response)

diff --cc motioneye/mediafiles.py
index a26c0fa475692ab559eb5b4a63e6bff3d0f26643,bdca31e780546cc0a9781736ba9da1f0dc3a16f6..64c035c1ea9bddcec16e03073d3d620bdccbfcab
--- 1/motioneye/mediafiles.py
--- 2/motioneye/mediafiles.py
+++ b/motioneye/mediafiles.py
@@@ -319,13 -381,12 +382,13 @@@ def list_media(camera_config, media_typ
              path = p[len(target_dir):]
              if not path.startswith('/'):
                  path = '/' + path
-     
+ 
              timestamp = st.st_mtime
              size = st.st_size
-             
+ 
              pipe.send({
                  'path': path,
 +                'mimeType': mimetypes.guess_type(path)[0],
                  'momentStr': utils.pretty_date_time(datetime.datetime.fromtimestamp(timestamp)),
                  'momentStrShort': utils.pretty_date_time(datetime.datetime.fromtimestamp(timestamp), short=True),
                  'sizeStr': utils.pretty_size(size),

diff --cc motioneye/remote.py
index 23ca8c52853464e146121a0ca382d96bd7ca352c,b5cb9970ff4809c89757c0dd5e7aa23b5e624b28..ed724ff58885230da7c4d9233b56ca5950f10475
--- 1/motioneye/remote.py
--- 2/motioneye/remote.py
+++ b/motioneye/remote.py
@@@ -393,11 -392,11 +392,11 @@@ def get_media_content(local_config, fil
              'media_type': media_type,
              'id': camera_id,
              'filename': filename}
 -    
 +
      # timeout here is 10 times larger than usual - we expect a big delay when fetching the media list
      request = _make_request(scheme, host, port, username, password,
-             path, timeout=10 * settings.REMOTE_REQUEST_TIMEOUT)
- 
+                             path, timeout=10 * settings.REMOTE_REQUEST_TIMEOUT)
+     
      def on_response(response):
          if response.error:
              logging.error('failed to download file %(filename)s of remote camera %(id)s on %(url)s: %(msg)s' % {

diff --cc motioneye/static/js/main.js
Simple merge