From 8f0b7dd6d19f60897e1b4a2e2b0d6d8f5bb5fdad Mon Sep 17 00:00:00 2001 From: Salandora Date: Sat, 2 Apr 2016 15:41:27 +0200 Subject: [PATCH] Fix timelapse postroll Images got captured with wrong filename Additionally fixed some refactoring mistakes --- src/octoprint/timelapse.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index b24bd5a1..2b6f2990 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -500,12 +500,12 @@ class ZTimelapse(Timelapse): def process_post_roll(self): with self._capture_mutex: - filename = os.path.join(self._capture_dir, "tmp_%05d.jpg" % self._image_number) + filename = os.path.join(self._capture_dir, _capture_format.format(prefix=self._file_prefix) % self._image_number) self._image_number += 1 if self._perform_capture(filename): for _ in range(self._post_roll * self._fps): - newFile = os.path.join(self._capture_dir, "tmp_%05d.jpg" % self._image_number) + newFile = os.path.join(self._capture_dir, _capture_format.format(prefix=self._file_prefix) % self._image_number) self._image_number += 1 shutil.copyfile(filename, newFile) @@ -550,11 +550,11 @@ class TimedTimelapse(Timelapse): self._timer.start() def on_print_done(self, event, payload): - self._postroll_captures = self.post_roll * self.fps + self._postroll_captures = self._post_roll * self._fps Timelapse.on_print_done(self, event, payload) def calculate_post_roll(self): - return self.post_roll * self.fps * self.interval + return self._post_roll * self._fps * self._interval def process_post_roll(self): pass