From 935c1da30f60b92531b8516671427939bba3f242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Dec 2015 14:06:49 +0100 Subject: [PATCH 1/6] Updated Changelog for 1.2.8 again Now includes note about updatefix plugin and changelog entry about fixed softwareupdate issue. --- CHANGELOG.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7024d77b..9a55e6b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ # OctoPrint Changelog -## 1.2.8 (2015-12-01) +## 1.2.8 (2015-12-02) + +### Important information for people updating from version 1.2.7 + +Due to a bug in the Software Update plugin bundled with version 1.2.7, updating +to 1.2.8 necessitates the installation of a plugin that fixes said bug +(through monkey patching). + +The plugin "Updatefix 1.2.7" can be found [in the plugin repository](http://plugins.octoprint.org/plugins/updatefix127/) and +[on Github](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7/). + +Before attempting to update your installation from version 1.2.7 to version 1.2.8, +please install the plugin via your plugin manager (it doesn't necessitate a +restart or even a reload). Afterwards you can update as usual. The plugin will +self-uninstall once it detects that it's running under OctoPrint 1.2.8. ### Improvements @@ -43,6 +57,9 @@ displaying bed temperature and controls and allowing the sending of GCODE commands targeting the bed (`M140`, `M190`) if the printer profile doesn't have a heated bed configured. + * Fixed an issue that stopped the software updater working for OctoPrint. A + fix can be applied for this issue to OctoPrint version 1.2.7 via + [the Updatefix 1.2.7 plugin](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7). * Fix: Current filename in job data should never be prefixed with `/` * Only persist plugin settings that differ from the defaults. This way the `config.yaml` won't be filled with lots of redundant data. It's the From 42d288c0e223ea896c5f614429f4faa3c17892a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Dec 2015 16:34:57 +0100 Subject: [PATCH 2/6] Updatefix 1.2.7 plugin needs restart after all --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a55e6b2..4bbb70ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,9 +12,9 @@ The plugin "Updatefix 1.2.7" can be found [in the plugin repository](http://plug [on Github](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7/). Before attempting to update your installation from version 1.2.7 to version 1.2.8, -please install the plugin via your plugin manager (it doesn't necessitate a -restart or even a reload). Afterwards you can update as usual. The plugin will -self-uninstall once it detects that it's running under OctoPrint 1.2.8. +please install the plugin via your plugin manager and restart your server. +Afterwards you can update as usual. The plugin will self-uninstall once it +detects that it's running under OctoPrint 1.2.8. ### Improvements From c5bc000b56cc1c7b7a0daca05b4ab1a5b670a3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Dec 2015 17:12:04 +0100 Subject: [PATCH 3/6] Increased timeout for waiting for restart after update 20sec is too little. --- .../plugins/softwareupdate/static/js/softwareupdate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index 8b75047b..ac6a5ded 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -387,7 +387,7 @@ $(function() { } }); self.waitingForRestart = false; - }, 20000); + }, 60000); break; } From 1e9ea8e85e7e6cb86aa69eba7c4f28885c948540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Dec 2015 17:12:17 +0100 Subject: [PATCH 4/6] Updated Changelog again --- CHANGELOG.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bbb70ee..3170a7fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # OctoPrint Changelog -## 1.2.8 (2015-12-02) +## 1.2.8 (2015-12-03) ### Important information for people updating from version 1.2.7 Due to a bug in the Software Update plugin bundled with version 1.2.7, updating -to 1.2.8 necessitates the installation of a plugin that fixes said bug -(through monkey patching). +to 1.2.8 through OctoPrint itself necessitates the installation of a plugin +that fixes said bug (through monkey patching). The plugin "Updatefix 1.2.7" can be found [in the plugin repository](http://plugins.octoprint.org/plugins/updatefix127/) and [on Github](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7/). @@ -14,7 +14,10 @@ The plugin "Updatefix 1.2.7" can be found [in the plugin repository](http://plug Before attempting to update your installation from version 1.2.7 to version 1.2.8, please install the plugin via your plugin manager and restart your server. Afterwards you can update as usual. The plugin will self-uninstall once it -detects that it's running under OctoPrint 1.2.8. +detects that it's running under OctoPrint 1.2.8. After the self-uninstall another restart +of your server will be triggered (if you have setup your server's restart command, +defaults to `sudo service octoprint restart` on OctoPi) in order to really get rid of any +left-overs, so don't be alarmed when that happens. ### Improvements @@ -47,6 +50,8 @@ detects that it's running under OctoPrint 1.2.8. scroll and the current log excerpt will stay put while also not causing the browser to run into memory errors due to trying to buffer an endless amount of log lines. + * Increased timeout of "waiting for restart" after an update from 20 to 60sec + (20sec turned out to be too little for OctoPi for whatever reason). * Added a couple of unit tests ### Bug Fixes @@ -60,6 +65,8 @@ detects that it's running under OctoPrint 1.2.8. * Fixed an issue that stopped the software updater working for OctoPrint. A fix can be applied for this issue to OctoPrint version 1.2.7 via [the Updatefix 1.2.7 plugin](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7). + For more information please refer to the [Important information for people updating from version 1.2.7](#important-information-for-people-updating-from-version-127) + above. * Fix: Current filename in job data should never be prefixed with `/` * Only persist plugin settings that differ from the defaults. This way the `config.yaml` won't be filled with lots of redundant data. It's the From bad88da2fef370146423890c6e13de53ff287a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 2 Dec 2015 18:12:08 +0100 Subject: [PATCH 5/6] Fixed a scrolling issue on the terminal tab --- .../static/js/app/viewmodels/terminal.js | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/octoprint/static/js/app/viewmodels/terminal.js b/src/octoprint/static/js/app/viewmodels/terminal.js index 7be593c6..ba7b0436 100644 --- a/src/octoprint/static/js/app/viewmodels/terminal.js +++ b/src/octoprint/static/js/app/viewmodels/terminal.js @@ -35,7 +35,8 @@ $(function() { var filtered = false; var result = []; - _.each(self.log(), function(entry) { + var lines = self.log(); + _.each(lines, function(entry) { if (lineVisible(entry)) { result.push(entry); filtered = false; @@ -47,14 +48,17 @@ $(function() { return result; }); - self.displayedLines.subscribe(function() { - self.updateOutput(); - }); self.lineCount = ko.computed(function() { - var total = self.log().length; - var filtered = _.filter(self.displayedLines(), function(entry) { return entry.type == "filtered" }).length; - var displayed = _.filter(self.displayedLines(), function(entry) { return entry.type == "line" }).length; + var regex = self.filterRegex(); + var lineVisible = function(entry) { + return regex == undefined || !entry.line.match(regex); + }; + + var lines = self.log(); + var total = lines.length; + var displayed = _.filter(lines, lineVisible).length; + var filtered = total - displayed; if (filtered > 0) { if (total > self.upperLimit()) { @@ -112,10 +116,12 @@ $(function() { newLog = newLog.slice(0, self.upperLimit()); } self.log(newLog); + self.updateOutput(); }; self._processHistoryLogData = function(data) { self.log(_.map(data, function(line) { return self._toInternalFormat(line) })); + self.updateOutput(); }; self._toInternalFormat = function(line, type) { @@ -165,7 +171,7 @@ $(function() { self.scrollToEnd = function() { var container = $("#terminal-output"); if (container.length) { - container.scrollTop(container[0].scrollHeight - container.height()) + container.scrollTop(container[0].scrollHeight); } }; From 9d6b6cf103aa3297b76b09867db626503dfadbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 3 Dec 2015 12:02:36 +0100 Subject: [PATCH 6/6] Going to release 1.2.8 after the weekend --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3170a7fd..b2f5ad77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # OctoPrint Changelog -## 1.2.8 (2015-12-03) +## 1.2.8 (unreleased) ### Important information for people updating from version 1.2.7