pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1255 from 2bitoperations/add-mp4

Browse source 
allow download/management of mp4 timelapse too
This commit is contained in:
Gina Häußge 2016-03-07 15:41:49 +01:00
commit 40cefe7a89
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/server/__init__.py
View file

@ -366,7 +366,8 @@ class Server():
server_routes = self._router.urls + [
# various downloads
(r"/downloads/timelapse/([^/]*\.mpg)", util.tornado.LargeResponseHandler, joined_dict(dict(path=self._settings.getBaseFolder("timelapse")),
# .mpg and .mp4 timelapses:
(r"/downloads/timelapse/([^/]*\.mp[g4])", util.tornado.LargeResponseHandler, joined_dict(dict(path=self._settings.getBaseFolder("timelapse")),
download_handler_kwargs,
no_hidden_files_validator)),
(r"/downloads/files/local/(.*)", util.tornado.LargeResponseHandler, joined_dict(dict(path=self._settings.getBaseFolder("uploads")),

2
src/octoprint/timelapse.py
View file

@ -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({