q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed using wrong item collection for timelapse files, lead to always displaying all files, not just the ones of the current page.

master
Gina Häußge 2013-03-09 12:58:15 +01:00
parent 1d2a2c873f
commit a261896186
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octoprint/templates/index.html
View File

@ -482,7 +482,7 @@
<th class="timelapse_files_action">Action</th>
</tr>
</thead>
<tbody data-bind="foreach: listHelper.items">
<tbody data-bind="foreach: listHelper.paginatedItems">
<tr data-bind="attr: {title: name}">
<td class="timelapse_files_name" data-bind="text: name"></td>
<td class="timelapse_files_size" data-bind="text: size"></td>

2
octoprint/timelapse.py
View File

@ -106,7 +106,7 @@ class Timelapse(object):
# Because ffmpeg hiccups on windows' drive letters and backslashes we have to give the watermark
# path a special treatment. Yeah, I couldn't believe it either...
watermark = watermark.replace("\\", "/").replace(":", "\\\\:")
command.extend(['-vf', 'movie=%s [wm]; [in][wm] overlay=10:main_h-overlay_h-10 [out]' % (watermark)])
command.extend(['-vf', 'movie=%s [wm]; [in][wm] overlay=10:main_h-overlay_h-10 [out]' % watermark])
# finalize command with output file
command.append(output)