From 398eaf58a904eabd58e5b893ba11d3a3216a3900 Mon Sep 17 00:00:00 2001 From: Andrew Malota Date: Mon, 7 Mar 2016 14:44:11 +0100 Subject: [PATCH] allow download/management of mp4 timelapse too (cherry picked from commit a00faf2) --- src/octoprint/server/__init__.py | 2 +- src/octoprint/timelapse.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index d458f039..063f321c 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -370,7 +370,7 @@ class Server(): server_routes = self._router.urls + [ # various downloads - (r"/downloads/timelapse/([^/]*\.mpg)", util.tornado.LargeResponseHandler, joined_dict(dict(path=s.getBaseFolder("timelapse")), download_handler_kwargs, no_hidden_files_validator)), + (r"/downloads/timelapse/([^/]*\.mp[g4])", util.tornado.LargeResponseHandler, joined_dict(dict(path=s.getBaseFolder("timelapse")), download_handler_kwargs, no_hidden_files_validator)), (r"/downloads/files/local/(.*)", util.tornado.LargeResponseHandler, joined_dict(dict(path=s.getBaseFolder("uploads")), download_handler_kwargs, no_hidden_files_validator, additional_mime_types)), (r"/downloads/logs/([^/]*)", util.tornado.LargeResponseHandler, joined_dict(dict(path=s.getBaseFolder("logs")), download_handler_kwargs, admin_validator)), # camera snapshot diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index d635d23a..b24bd5a1 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -62,7 +62,7 @@ def get_finished_timelapses(): files = [] basedir = settings().getBaseFolder("timelapse") for osFile in os.listdir(basedir): - if not fnmatch.fnmatch(osFile, "*.mpg"): + if not fnmatch.fnmatch(osFile, "*.mp[g4]"): continue statResult = os.stat(os.path.join(basedir, osFile)) files.append({