]> www.vanbest.org Git - motioneye-debian/commitdiff
Remove whitespace-only file modifications.
authorDermot Duffy <dermot.duffy@gmail.com>
Tue, 27 Feb 2018 23:16:15 +0000 (23:16 +0000)
committerDermot Duffy <dermot.duffy@gmail.com>
Tue, 27 Feb 2018 23:16:15 +0000 (23:16 +0000)
motioneye/handlers.py
motioneye/remote.py

index 0cbaa6282bed2abf4acd4f0727809311895f7659..4fe9125f47fb925ceb27bf54b9c0967c23cb5ab5 100644 (file)
@@ -1520,12 +1520,13 @@ class MovieHandler(BaseHandler):
         camera_config = config.get_camera(camera_id)
         if utils.is_local_motion_camera(camera_config):
             content = mediafiles.get_media_content(camera_config, filename, 'movie')
-
+            
             pretty_filename = camera_config['@name'] + '_' + os.path.basename(filename)
             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)
+        
         elif utils.is_remote_camera(camera_config):
             def on_response(response=None, error=None):
                 if error:
@@ -1535,7 +1536,7 @@ class MovieHandler(BaseHandler):
                 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)
index ed724ff58885230da7c4d9233b56ca5950f10475..b5cb9970ff4809c89757c0dd5e7aa23b5e624b28 100644 (file)
@@ -392,7 +392,7 @@ def get_media_content(local_config, filename, media_type, callback):
             '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)