From: Dermot Duffy Date: Tue, 27 Feb 2018 23:16:15 +0000 (+0000) Subject: Remove whitespace-only file modifications. X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=c25e0c71d88c31505a56cc2d72b03c2e3c281702;p=motioneye-debian Remove whitespace-only file modifications. --- diff --git a/motioneye/handlers.py b/motioneye/handlers.py index 0cbaa62..4fe9125 100644 --- a/motioneye/handlers.py +++ b/motioneye/handlers.py @@ -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) diff --git a/motioneye/remote.py b/motioneye/remote.py index ed724ff..b5cb997 100644 --- a/motioneye/remote.py +++ b/motioneye/remote.py @@ -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)