From 2f04ef43d5f61bb9aa5de0ee013ec0687f4ebe95 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 11:00:25 +0200 Subject: [PATCH 01/26] changed all plugin branches to stable-1.2.2 --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 35eb45e7..a306d50f 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -140,21 +140,21 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "type": "github_commit", "repo": "mrbeam-inkscape-ext", "user": "mrbeam", - "branch": "mrbeam-stable", + "branch": "stable-1.2.2", }, "lcd": { "update_folder": "/home/pi/lcd", "type": "github_commit", "repo": "lcd", "user": "mrbeam", - "branch": "mrbeam-stable", + "branch": "stable-1.2.2", }, "netconnectd": { "update_folder": "/home/pi/netconnectd", "type": "github_commit", "repo": "netconnectd", "user": "mrbeam", - "branch": "mrbeam-stable", + "branch": "stable-1.2.2", }, }, From aa918ad980a4b7e4e7ee972afeecb5da3e693d78 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 11:18:56 +0200 Subject: [PATCH 02/26] added update_script and restart key to default values --- src/octoprint/plugins/softwareupdate/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index a306d50f..905646bd 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -141,6 +141,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", + "update_script": "" }, "lcd": { "update_folder": "/home/pi/lcd", @@ -148,6 +149,8 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "lcd", "user": "mrbeam", "branch": "stable-1.2.2", + "update_script": "", + "restart": "environment" }, "netconnectd": { "update_folder": "/home/pi/netconnectd", @@ -155,6 +158,8 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "netconnectd", "user": "mrbeam", "branch": "stable-1.2.2", + "update_script": "", + "restart": "environment" }, }, From 4b2959387753951fccfbbf3588770ec408c1e208 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 11:28:13 +0200 Subject: [PATCH 03/26] changed empty update_script string to pwd --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 905646bd..83bf1d9b 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -141,7 +141,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "" + "update_script": "pwd" }, "lcd": { "update_folder": "/home/pi/lcd", @@ -149,7 +149,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "lcd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "", + "update_script": "pwd", "restart": "environment" }, "netconnectd": { @@ -158,7 +158,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "netconnectd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "", + "update_script": "pwd", "restart": "environment" }, }, From 30a5a45147c6a72b7f0eb151dd632afb30ba9323 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 11:45:05 +0200 Subject: [PATCH 04/26] changed update_script to "cd {target}; git pull" --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 83bf1d9b..8d780270 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -141,7 +141,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "pwd" + "update_script": "cd {target}; git pull" }, "lcd": { "update_folder": "/home/pi/lcd", @@ -149,7 +149,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "lcd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "pwd", + "update_script": "cd {target}; git pull", "restart": "environment" }, "netconnectd": { @@ -158,7 +158,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "netconnectd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "pwd", + "update_script": "cd {target}; git pull", "restart": "environment" }, }, From f094056590576e7a38351e90b482fd2f78aa9a34 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 12:27:47 +0200 Subject: [PATCH 05/26] changed update_script string --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 8d780270..fe51df6a 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -141,7 +141,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {target}; git pull" + "update_script": "cd {{target}} && git pull" }, "lcd": { "update_folder": "/home/pi/lcd", @@ -149,7 +149,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "lcd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {target}; git pull", + "update_script": "cd {{target}} && git pull", "restart": "environment" }, "netconnectd": { @@ -158,7 +158,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "netconnectd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {target}; git pull", + "update_script": "cd {{target}} && git pull", "restart": "environment" }, }, From 2db9724004dcb732c86cfad58360fad8419e302a Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 12:34:14 +0200 Subject: [PATCH 06/26] changed update_script --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index fe51df6a..f798793c 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -141,7 +141,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {{target}} && git pull" + "update_script": "cd {{folder}} && git pull" }, "lcd": { "update_folder": "/home/pi/lcd", @@ -149,7 +149,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "lcd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {{target}} && git pull", + "update_script": "cd {{folder}} && git pull", "restart": "environment" }, "netconnectd": { @@ -158,7 +158,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "netconnectd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {{target}} && git pull", + "update_script": "cd {{folder}} && git pull", "restart": "environment" }, }, From 912bb4ab1fa35ded4301d4bc5e44c7eb7b64f5a4 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 13:33:27 +0200 Subject: [PATCH 07/26] changed update_script --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index f798793c..c23d7fb6 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -141,7 +141,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {{folder}} && git pull" + "update_script": "git pull" }, "lcd": { "update_folder": "/home/pi/lcd", @@ -149,7 +149,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "lcd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {{folder}} && git pull", + "update_script": "git pull", "restart": "environment" }, "netconnectd": { @@ -158,7 +158,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "netconnectd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "cd {{folder}} && git pull", + "update_script": "git pull", "restart": "environment" }, }, From 65bff81d35c2f1177ccaf82a20ff1a48fb9667ee Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 14:52:58 +0200 Subject: [PATCH 08/26] added ne update script git-pull (copied from update-octoprint.py) --- .../softwareupdate/scripts/git-pull.py | 180 ++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 src/octoprint/plugins/softwareupdate/scripts/git-pull.py diff --git a/src/octoprint/plugins/softwareupdate/scripts/git-pull.py b/src/octoprint/plugins/softwareupdate/scripts/git-pull.py new file mode 100644 index 00000000..a0688e4f --- /dev/null +++ b/src/octoprint/plugins/softwareupdate/scripts/git-pull.py @@ -0,0 +1,180 @@ +#!/bin/env python +from __future__ import absolute_import + +__author__ = "Gina Haeussge " +__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' +__copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License" + + +import errno +import subprocess +import sys + + +def _get_git_executables(): + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] + return GITS + + +def _git(args, cwd, hide_stderr=False, verbose=False, git_executable=None): + if git_executable is not None: + commands = [git_executable] + else: + commands = _get_git_executables() + + for c in commands: + try: + p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE, + stderr=(subprocess.PIPE if hide_stderr + else None)) + break + except EnvironmentError: + e = sys.exc_info()[1] + if e.errno == errno.ENOENT: + continue + if verbose: + print("unable to run %s" % args[0]) + print(e) + return None, None + else: + if verbose: + print("unable to find command, tried %s" % (commands,)) + return None, None + + stdout = p.communicate()[0].strip() + if sys.version >= '3': + stdout = stdout.decode() + + if p.returncode != 0: + if verbose: + print("unable to run %s (error)" % args[0]) + + return p.returncode, stdout + + +def _python(args, cwd, python_executable, sudo=False): + command = [python_executable] + args + if sudo: + command = ["sudo"] + command + try: + p = subprocess.Popen(command, cwd=cwd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + except: + return None, None + + stdout = p.communicate()[0].strip() + if sys.version >= "3": + stdout = stdout.decode() + + return p.returncode, stdout + + +def update_source(git_executable, folder, target, force=False): + print(">>> Running: git diff --shortstat") + returncode, stdout = _git(["diff", "--shortstat"], folder, git_executable=git_executable) + if returncode != 0: + raise RuntimeError("Could not update, \"git diff\" failed with returncode %d: %s" % (returncode, stdout)) + if stdout and stdout.strip(): + # we got changes in the working tree, maybe from the user, so we'll now rescue those into a patch + import time + import os + timestamp = time.strftime("%Y%m%d%H%M") + patch = os.path.join(folder, "%s-preupdate.patch" % timestamp) + + print(">>> Running: git diff and saving output to %s" % timestamp) + returncode, stdout = _git(["diff"], folder, git_executable=git_executable) + if returncode != 0: + raise RuntimeError("Could not update, installation directory was dirty and state could not be persisted as a patch to %s" % patch) + + with open(patch, "wb") as f: + f.write(stdout) + + print(">>> Running: git reset --hard") + returncode, stdout = _git(["reset", "--hard"], folder, git_executable=git_executable) + if returncode != 0: + raise RuntimeError("Could not update, \"git reset --hard\" failed with returncode %d: %s" % (returncode, stdout)) + + print(">>> Running: git pull") + returncode, stdout = _git(["pull"], folder, git_executable=git_executable) + if returncode != 0: + raise RuntimeError("Could not update, \"git pull\" failed with returncode %d: %s" % (returncode, stdout)) + print(stdout) + + if force: + reset_command = ["reset"] + reset_command += [target] + + print(">>> Running: git %s" % " ".join(reset_command)) + returncode, stdout = _git(reset_command, folder, git_executable=git_executable) + if returncode != 0: + raise RuntimeError("Error while updating, \"git %s\" failed with returncode %d: %s" % (" ".join(reset_command), returncode, stdout)) + print(stdout) + + +def install_source(python_executable, folder, user=False, sudo=False): + print(">>> Running: python setup.py clean") + returncode, stdout = _python(["setup.py", "clean"], folder, python_executable) + if returncode != 0: + print("\"python setup.py clean\" failed with returncode %d: %s" % (returncode, stdout)) + print("Continuing anyways") + print(stdout) + + print(">>> Running: python setup.py install") + args = ["setup.py", "install"] + if user: + args.append("--user") + returncode, stdout = _python(args, folder, python_executable, sudo=sudo) + if returncode != 0: + raise RuntimeError("Could not update, \"python setup.py install\" failed with returncode %d: %s" % (returncode, stdout)) + print(stdout) + + +def parse_arguments(): + import argparse + + parser = argparse.ArgumentParser(prog="update-octoprint.py") + + parser.add_argument("--git", action="store", type=str, dest="git_executable", + help="Specify git executable to use") + parser.add_argument("--python", action="store", type=str, dest="python_executable", + help="Specify python executable to use") + parser.add_argument("--force", action="store_true", dest="force", + help="Set this to force the update to only the specified version (nothing newer)") + parser.add_argument("--sudo", action="store_true", dest="sudo", + help="Install with sudo") + parser.add_argument("--user", action="store_true", dest="user", + help="Install to the user site directory instead of the general site directory") + parser.add_argument("folder", type=str, + help="Specify the base folder of the OctoPrint installation to update") + parser.add_argument("target", type=str, + help="Specify the commit or tag to which to update") + + args = parser.parse_args() + + return args + +def main(): + args = parse_arguments() + + git_executable = None + if args.git_executable: + git_executable = args.git_executable + + python_executable = sys.executable + if args.python_executable: + python_executable = args.python_executable + + folder = args.folder + target = args.target + + import os + if not os.access(folder, os.W_OK): + raise RuntimeError("Could not update, base folder is not writable") + + update_source(git_executable, folder, target, force=args.force) + #install_source(python_executable, folder, user=args.user, sudo=args.sudo) + +if __name__ == "__main__": + main() From 2a2696ff9ad8b88fd7e0a8bdeee59848f6e07ca2 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 11 Sep 2015 14:55:57 +0200 Subject: [PATCH 09/26] added new update script git-pull.py to update_script setting --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index c23d7fb6..70cbd901 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -141,7 +141,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "git pull" + "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")) }, "lcd": { "update_folder": "/home/pi/lcd", @@ -149,7 +149,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "lcd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "git pull", + "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), "restart": "environment" }, "netconnectd": { @@ -158,7 +158,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "netconnectd", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "git pull", + "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), "restart": "environment" }, }, From cacc6524a1b2e459c2b90e1753681bfd3d5a8a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 26 Aug 2015 15:50:57 +0200 Subject: [PATCH 10/26] cherry-pick 13d7d5f2f60ee8c188ea7d05ef920a5b76e5579a from foosel/OctoPrint --- .../plugins/softwareupdate/__init__.py | 100 +++++++++++++----- .../static/js/softwareupdate.js | 45 ++++++-- .../templates/softwareupdate_settings.jinja2 | 30 ++++-- .../softwareupdate/updaters/update_script.py | 12 ++- 4 files changed, 150 insertions(+), 37 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 70cbd901..85b0a152 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -12,6 +12,7 @@ import flask import os import threading import time +import hashlib from . import version_checks, updaters, exceptions, util @@ -83,8 +84,12 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, self._logger.exception("Error while loading version cache from disk") else: try: - if "octoprint" in data and len(data["octoprint"]) == 4 and "local" in data["octoprint"][1] and "value" in data["octoprint"][1]["local"]: - data_version = data["octoprint"][1]["local"]["value"] + if not isinstance(data, dict): + self._logger.info("Version cache was created in a different format, not using it") + return + + if "__version" in data: + data_version = data["__version"] else: self._logger.info("Can't determine version of OctoPrint version cache was created for, not using it") return @@ -102,24 +107,18 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, self._logger.exception("Error parsing in version cache data") def _save_version_cache(self): - import tempfile import yaml - import shutil + from octoprint.util import atomic_write + from octoprint._version import get_versions - file_obj = tempfile.NamedTemporaryFile(delete=False) - try: + octoprint_version = get_versions()["version"] + self._version_cache["__version"] = octoprint_version + + with atomic_write(self._version_cache_path) as file_obj: yaml.safe_dump(self._version_cache, stream=file_obj, default_flow_style=False, indent=" ", allow_unicode=True) - file_obj.close() - shutil.move(file_obj.name, self._version_cache_path) - self._version_cache_dirty = False - self._logger.info("Saved version cache to disk") - finally: - try: - if os.path.exists(file_obj.name): - os.remove(file_obj.name) - except Exception as e: - self._logger.warn("Could not delete file {}: {}".format(file_obj.name, str(e))) + self._version_cache_dirty = False + self._logger.info("Saved version cache to disk") #~~ SettingsPlugin API @@ -173,20 +172,62 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, data = dict(octoprint.plugin.SettingsPlugin.on_settings_load(self)) if "checks" in data: del data["checks"] + + checks = self._get_configured_checks() + if "octoprint" in checks: + if "checkout_folder" in checks["octoprint"]: + data["octoprint_checkout_folder"] = checks["octoprint"]["checkout_folder"] + elif "update_folder" in checks["octoprint"]: + data["octoprint_checkout_folder"] = checks["octoprint"]["update_folder"] + else: + data["octoprint_checkout_folder"] = None + data["octoprint_type"] = checks["octoprint"].get("type", None) + else: + data["octoprint_checkout_folder"] = None + data["octoprint_type"] = None + return data def on_settings_save(self, data): for key in self.get_settings_defaults(): - if key == "checks" or key == "cache_ttl": + if key == "checks" or key == "cache_ttl" or key == "octoprint_checkout_folder" or key == "octoprint_type": continue if key in data: self._settings.set([key], data[key]) if "cache_ttl" in data: self._settings.set_int(["cache_ttl"], data["cache_ttl"]) - self._version_cache_ttl = self._settings.get_int(["cache_ttl"]) * 60 + checks = self._get_configured_checks() + if "octoprint" in checks: + check = checks["octoprint"] + update_type = check.get("type", None) + checkout_folder = check.get("checkout_folder", None) + update_folder = check.get("update_folder", None) + + defaults = dict( + plugins=dict(softwareupdate=dict( + checks=dict( + octoprint=dict( + type=update_type, + checkout_folder=checkout_folder, + update_folder=update_folder + ) + ) + )) + ) + + if "octoprint_checkout_folder" in data: + self._settings.set(["checks", "octoprint", "checkout_folder"], data["octoprint_checkout_folder"], defaults=defaults, force=True) + if update_folder and data["octoprint_checkout_folder"]: + self._settings.set(["checks", "octoprint", "update_folder"], None, defaults=defaults, force=True) + self._refresh_configured_checks = True + + if "octoprint_type" in data and data["octoprint_type"] in ("github_release", "git_commit"): + self._settings.set(["checks", "octoprint", "type"], data["octoprint_type"], defaults=defaults, force=True) + self._refresh_configured_checks = True + def get_settings_version(self): return 3 @@ -368,7 +409,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, try: target_information, target_update_available, target_update_possible = self._get_current_version(target, populated_check, force=force) if target_information is None: - continue + target_information = dict() except exceptions.UnknownCheckType: self._logger.warn("Unknown update check type for %s" % target) continue @@ -387,22 +428,29 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, updatePossible=target_update_possible, information=target_information, displayName=populated_check["displayName"], - displayVersion=populated_check["displayVersion"].format(octoprint_version=octoprint_version, local_name=local_name, local_value=local_value)) + displayVersion=populated_check["displayVersion"].format(octoprint_version=octoprint_version, local_name=local_name, local_value=local_value), + check=populated_check) if self._version_cache_dirty: self._save_version_cache() return information, update_available, update_possible + def _get_check_hash(self, check): + hash = hashlib.md5() + hash.update(repr(check)) + return hash.hexdigest() + def _get_current_version(self, target, check, force=False): """ Determines the current version information for one target based on its check configuration. """ + current_hash = self._get_check_hash(check) if target in self._version_cache and not force: - timestamp, information, update_available, update_possible = self._version_cache[target] - if timestamp + self._version_cache_ttl >= time.time() > timestamp: + data = self._version_cache[target] + if data["hash"] == current_hash and data["timestamp"] + self._version_cache_ttl >= time.time() > data["timestamp"]: # we also check that timestamp < now to not get confused too much by clock changes - return information, update_available, update_possible + return data["information"], data["available"], data["possible"] information = dict() update_available = False @@ -426,7 +474,11 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, except: update_possible = False - self._version_cache[target] = (time.time(), information, update_available, update_possible) + self._version_cache[target] = dict(timestamp=time.time(), + hash=current_hash, + information=information, + available=update_available, + possible=update_possible) self._version_cache_dirty = True return information, update_available, update_possible diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index 19c88137..ed2d2fa9 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -13,12 +13,20 @@ $(function() { self.currentlyBeingUpdated = []; - self.config_restartCommand = ko.observable(); - self.config_rebootCommand = ko.observable(); + self.octoprintUnconfigured = ko.observable(); + self.octoprintUnreleased = ko.observable(); + self.config_cacheTtl = ko.observable(); + self.config_checkoutFolder = ko.observable(); + self.config_checkType = ko.observable(); self.configurationDialog = $("#settings_plugin_softwareupdate_configurationdialog"); + self.config_availableCheckTypes = [ + {"key": "github_release", "name": gettext("Release")}, + {"key": "git_commit", "name": gettext("Commit")} + ]; + self.versions = new ItemListHelper( "plugin.softwareupdate.versions", { @@ -78,19 +86,25 @@ $(function() { var data = { plugins: { softwareupdate: { - octoprint_restart_command: self.config_restartCommand(), - environment_restart_command: self.config_rebootCommand(), - cache_ttl: parseInt(self.config_cacheTtl()) + cache_ttl: parseInt(self.config_cacheTtl()), + octoprint_checkout_folder: self.config_checkoutFolder(), + octoprint_type: self.config_checkType() } } }; - self.settings.saveData(data, function() { self.configurationDialog.modal("hide"); self._copyConfig(); }); + self.settings.saveData(data, function() { + self.configurationDialog.modal("hide"); + self._copyConfig(); + self.performCheck(); + }); }; self._copyConfig = function() { self.config_restartCommand(self.settings.settings.plugins.softwareupdate.octoprint_restart_command()); self.config_rebootCommand(self.settings.settings.plugins.softwareupdate.environment_restart_command()); self.config_cacheTtl(self.settings.settings.plugins.softwareupdate.cache_ttl()); + self.config_checkoutFolder(self.settings.settings.plugins.softwareupdate.octoprint_checkout_folder()); + self.config_checkType(self.settings.settings.plugins.softwareupdate.octoprint_type()); }; self.fromCheckResponse = function(data, ignoreSeen, showIfNothingNew) { @@ -109,6 +123,25 @@ $(function() { }); self.versions.updateItems(versions); + var octoprint = data.information["octoprint"]; + if (octoprint && octoprint.hasOwnProperty("check")) { + var check = octoprint.check; + if (BRANCH != "master" && check["type"] == "github_release") { + self.octoprintUnreleased(true); + } else { + self.octoprintUnreleased(false); + } + + var checkoutFolder = (check["checkout_folder"] || "").trim(); + var updateFolder = (check["update_folder"] || "").trim(); + var checkType = check["type"] || ""; + if ((checkType == "github_release" || checkType == "git_commit") && checkoutFolder == "" && updateFolder == "") { + self.octoprintUnconfigured(true); + } else { + self.octoprintUnconfigured(false); + } + } + if (data.status == "updateAvailable" || data.status == "updatePossible") { var text = gettext("There are updates available for the following components:"); diff --git a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 index 96f01713..c3b0bdc8 100644 --- a/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 +++ b/src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2 @@ -1,3 +1,21 @@ +
{% trans %} + Please configure the checkout folder of OctoPrint, otherwise + this plugin won't be able to update it. Click on the button + to do this. Also refer to the Documentation. +{% endtrans %}
+
{% trans %} +

+ You are running a non-release version of OctoPrint but are tracking OctoPrint + releases. +

+ You probably want OctoPrint to track the matching development version instead. + If you have a local OctoPrint checkout folder switched to another branch, + simply switching over to "Commit" tracking will already + take care of that. Otherwise please take a look at the + Documentation. +

+{% endtrans %}
+
@@ -11,7 +29,7 @@ - :
+ :
{{ _('Installed:') }}
{{ _('Available:') }} @@ -44,7 +62,7 @@
- +
@@ -56,15 +74,15 @@
- +
- +
- +
- +
diff --git a/src/octoprint/plugins/softwareupdate/updaters/update_script.py b/src/octoprint/plugins/softwareupdate/updaters/update_script.py index 4d6f69d4..db3a114b 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/update_script.py +++ b/src/octoprint/plugins/softwareupdate/updaters/update_script.py @@ -13,7 +13,17 @@ from ..util import execute def can_perform_update(target, check): - return "update_script" in check and ("checkout_folder" in check or "update_folder" in check) + import os + script_configured = bool("update_script" in check and check["update_script"]) + + folder = None + if "update_folder" in check: + folder = check["update_folder"] + elif "checkout_folder" in check: + folder = check["checkout_folder"] + folder_configured = bool(folder and os.path.isdir(folder)) + + return script_configured and folder_configured def perform_update(target, check, target_version): From 10dc7e4976d7c18b68994162593bfeb827af6da3 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 14 Sep 2015 11:58:27 +0200 Subject: [PATCH 11/26] changed dafault update branch to grblautoupdate for testing --- src/octoprint/plugins/softwareupdate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 85b0a152..442fef46 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -130,7 +130,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "type": "github_commit", "repo": "OctoPrint", "user": "mrbeam", - "branch": "stable-1.2.2", + "branch": "grblautoupdate", "update_script": "{{python}} \"{update_script}\" --python=\"{{python}}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "update-octoprint.py")), "restart": "octoprint" }, From d0fadb1b6f8b53499ecb0c57ddc7e5b13559e0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 21 Aug 2015 19:52:31 +0200 Subject: [PATCH 12/26] atomic_write context to save configs first to temp file, then move Should prevent corruption of files (cherry picked from commit c6d0290) --- src/octoprint/printer/profile.py | 10 ++++++---- src/octoprint/settings.py | 16 +++++++++++----- src/octoprint/util/__init__.py | 10 ++++++++++ 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/octoprint/printer/profile.py b/src/octoprint/printer/profile.py index 06560d74..88bdfe3e 100644 --- a/src/octoprint/printer/profile.py +++ b/src/octoprint/printer/profile.py @@ -329,12 +329,14 @@ class PrinterProfileManager(object): if os.path.exists(path) and not allow_overwrite: raise SaveError("Profile %s already exists and not allowed to overwrite" % profile["id"]) + from octoprint.util import atomic_write import yaml - with open(path, "wb") as f: - try: + try: + with atomic_write(path, "wb") as f: yaml.safe_dump(profile, f, default_flow_style=False, indent=" ", allow_unicode=True) - except Exception as e: - raise SaveError("Cannot save profile %s: %s" % (profile["id"], str(e))) + except Exception as e: + self._logger.exception("Error while trying to save profile %s" % profile["id"]) + raise SaveError("Cannot save profile %s: %s" % (profile["id"], str(e))) def _remove_from_path(self, path): try: diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index 7b191066..3ce247bc 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -784,11 +784,17 @@ class Settings(object): if not self._dirty and not force: return False - with open(self._configfile, "wb") as configFile: - yaml.safe_dump(self._config, configFile, default_flow_style=False, indent=" ", allow_unicode=True) - self._dirty = False - self.load() - return True + from octoprint.util import atomic_write + try: + with atomic_write(self._configfile, "wb", prefix="octoprint-config-", suffix=".yaml") as configFile: + yaml.safe_dump(self._config, configFile, default_flow_style=False, indent=" ", allow_unicode=True) + self._dirty = False + except: + self._logger.exception("Error while saving config.yaml!") + raise + else: + self.load() + return True @property def last_modified(self): diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py index 3b3d03a4..392cd19a 100644 --- a/src/octoprint/util/__init__.py +++ b/src/octoprint/util/__init__.py @@ -17,6 +17,7 @@ import shutil import threading from functools import wraps import warnings +import contextlib logger = logging.getLogger(__name__) @@ -513,6 +514,15 @@ def address_for_client(host, port): except: continue + +@contextlib.contextmanager +def atomic_write(filename, mode="w+b", prefix="tmp", suffix=""): + temp_config = tempfile.NamedTemporaryFile(mode=mode, prefix=prefix, suffix=suffix, delete=False) + yield temp_config + temp_config.close() + shutil.move(temp_config.name, filename) + + class RepeatedTimer(threading.Thread): """ This class represents an action that should be run repeatedly in an interval. It is similar to python's From fc63f9538535699351279893d9be2f0851755453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 26 Aug 2015 15:25:16 +0200 Subject: [PATCH 13/26] Also provide branch info to UI/on socket (cherry picked from commit cc8dcef) --- src/octoprint/server/util/sockjs.py | 8 +++++++- src/octoprint/server/views.py | 4 +++- src/octoprint/static/js/app/dataupdater.js | 1 + src/octoprint/templates/initscript.jinja2 | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/octoprint/server/util/sockjs.py b/src/octoprint/server/util/sockjs.py index 8e7df023..eb802889 100644 --- a/src/octoprint/server/util/sockjs.py +++ b/src/octoprint/server/util/sockjs.py @@ -59,7 +59,13 @@ class PrinterStateConnection(sockjs.tornado.SockJSConnection, octoprint.printer. plugin_hash.update(",".join(ui_plugins)) # connected => update the API key, might be necessary if the client was left open while the server restarted - self._emit("connected", {"apikey": octoprint.server.UI_API_KEY, "version": octoprint.server.VERSION, "display_version": octoprint.server.DISPLAY_VERSION, "plugin_hash": plugin_hash.hexdigest()}) + self._emit("connected", { + "apikey": octoprint.server.UI_API_KEY, + "version": octoprint.server.VERSION, + "display_version": octoprint.server.DISPLAY_VERSION, + "branch": octoprint.server.BRANCH, + "plugin_hash": plugin_hash.hexdigest() + }) self._printer.register_callback(self) self._fileManager.register_slicingprogress_callback(self) diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index 058b4848..0ef4cd36 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -12,7 +12,8 @@ from flask import request, g, url_for, make_response, render_template, send_from import octoprint.plugin -from octoprint.server import app, userManager, pluginManager, gettext, debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY +from octoprint.server import app, userManager, pluginManager, gettext, \ + debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY, BRANCH from octoprint.settings import settings from . import util @@ -252,6 +253,7 @@ def index(): debug=debug, version=VERSION, display_version=DISPLAY_VERSION, + branch=BRANCH, gcodeMobileThreshold=settings().get(["gcodeViewer", "mobileSizeThreshold"]), gcodeThreshold=settings().get(["gcodeViewer", "sizeThreshold"]), uiApiKey=UI_API_KEY, diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js index b1e8efa5..185d6d8b 100644 --- a/src/octoprint/static/js/app/dataupdater.js +++ b/src/octoprint/static/js/app/dataupdater.js @@ -124,6 +124,7 @@ function DataUpdater(allViewModels) { var oldVersion = VERSION; VERSION = data["version"]; DISPLAY_VERSION = data["display_version"]; + BRANCH = data["branch"]; $("span.version").text(DISPLAY_VERSION); var oldPluginHash = self._pluginHash; diff --git a/src/octoprint/templates/initscript.jinja2 b/src/octoprint/templates/initscript.jinja2 index 4d8094a8..c5a39dc1 100644 --- a/src/octoprint/templates/initscript.jinja2 +++ b/src/octoprint/templates/initscript.jinja2 @@ -21,11 +21,12 @@ var SOCKJS_URI = "{{ url_for('index') }}" + "sockjs"; var SOCKJS_DEBUG = CONFIG_DEBUG; // sockjs should define CLOSE_NORMAL for us, but they don't (from ws spec) - var SOCKJS_CLOSE_NORMAL = 1000 + var SOCKJS_CLOSE_NORMAL = 1000; var UI_API_KEY = "{{ uiApiKey }}"; var VERSION = "{{ version }}"; var DISPLAY_VERSION = "{{ display_version }}"; + var BRANCH = "{{ branch }}"; var LOCALE = "{{ g.locale }}"; var AVAILABLE_LOCALES = {{ locales|tojson }}; From d7485d288eb502d19320c2632ab34d25d6a1ee94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 21 Jul 2015 18:02:03 +0200 Subject: [PATCH 14/26] cherry picked from 93763a5563abe10844ccf0120b34790168059c38 foosel/OctoPrint --- .../plugins/softwareupdate/static/js/softwareupdate.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index ed2d2fa9..a4b7e74d 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -13,9 +13,6 @@ $(function() { self.currentlyBeingUpdated = []; - self.octoprintUnconfigured = ko.observable(); - self.octoprintUnreleased = ko.observable(); - self.config_cacheTtl = ko.observable(); self.config_checkoutFolder = ko.observable(); self.config_checkType = ko.observable(); From 3d68517cd757c42cd43bd4a8a6782c9982177be8 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 14 Sep 2015 15:03:32 +0200 Subject: [PATCH 15/26] added octoprintUnconfigured and octoprintUnreleased ko.observable() --- .../plugins/softwareupdate/static/js/softwareupdate.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index a4b7e74d..ed2d2fa9 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -13,6 +13,9 @@ $(function() { self.currentlyBeingUpdated = []; + self.octoprintUnconfigured = ko.observable(); + self.octoprintUnreleased = ko.observable(); + self.config_cacheTtl = ko.observable(); self.config_checkoutFolder = ko.observable(); self.config_checkType = ko.observable(); From 650006b5db4e719afa405b6c341e4fd2fce94917 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 14 Sep 2015 15:11:15 +0200 Subject: [PATCH 16/26] deleted restartCommand and rebootCommand --- .../plugins/softwareupdate/static/js/softwareupdate.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index ed2d2fa9..2da08896 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -100,8 +100,6 @@ $(function() { }; self._copyConfig = function() { - self.config_restartCommand(self.settings.settings.plugins.softwareupdate.octoprint_restart_command()); - self.config_rebootCommand(self.settings.settings.plugins.softwareupdate.environment_restart_command()); self.config_cacheTtl(self.settings.settings.plugins.softwareupdate.cache_ttl()); self.config_checkoutFolder(self.settings.settings.plugins.softwareupdate.octoprint_checkout_folder()); self.config_checkType(self.settings.settings.plugins.softwareupdate.octoprint_type()); From cecc9bb633e99d2b943009c8d4cd7dde301dfde6 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 14 Sep 2015 16:00:55 +0200 Subject: [PATCH 17/26] changed from update_folder to checkoutfolder for github_commit type --- src/octoprint/plugins/softwareupdate/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 442fef46..57a471c3 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -126,7 +126,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, return { "checks": { "octoprint": { - "update_folder": "/home/pi/OctoPrint", + "checkout_folder": "/home/pi/OctoPrint", "type": "github_commit", "repo": "OctoPrint", "user": "mrbeam", @@ -135,7 +135,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "restart": "octoprint" }, "svgtogcode": { - "update_folder": "/home/pi/mrbeam-inkscape-ext", + "checkout_folder": "/home/pi/mrbeam-inkscape-ext", "type": "github_commit", "repo": "mrbeam-inkscape-ext", "user": "mrbeam", @@ -143,7 +143,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")) }, "lcd": { - "update_folder": "/home/pi/lcd", + "checkout_folder": "/home/pi/lcd", "type": "github_commit", "repo": "lcd", "user": "mrbeam", @@ -152,7 +152,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "restart": "environment" }, "netconnectd": { - "update_folder": "/home/pi/netconnectd", + "checkout_folder": "/home/pi/netconnectd", "type": "github_commit", "repo": "netconnectd", "user": "mrbeam", From e4a141d7e7a34f24a8cae9b5c26be2bd2fab5093 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 14 Sep 2015 17:53:49 +0200 Subject: [PATCH 18/26] deleted unnesacery lines --- src/octoprint/plugins/softwareupdate/__init__.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 57a471c3..6d039f0d 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -688,13 +688,6 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, if not "type" in check: raise exceptions.ConfigurationInvalid("no check type defined") - if target == "octoprint": - from octoprint._version import get_versions - from flask.ext.babel import gettext - check["displayName"] = gettext("OctoPrint") - check["displayVersion"] = "{octoprint_version}" - check["current"] = get_versions()["version"] - check_type = check["type"] if check_type == "github_release": return version_checks.github_release From 823b7be3f8eb90664cd8ebdfd532370b27c1f03f Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 12:13:21 +0200 Subject: [PATCH 19/26] added default value for current to None --- src/octoprint/plugins/softwareupdate/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 6d039f0d..5ab0f57e 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -132,7 +132,8 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "grblautoupdate", "update_script": "{{python}} \"{update_script}\" --python=\"{{python}}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "update-octoprint.py")), - "restart": "octoprint" + "restart": "octoprint", + "current": None }, "svgtogcode": { "checkout_folder": "/home/pi/mrbeam-inkscape-ext", @@ -140,7 +141,8 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "repo": "mrbeam-inkscape-ext", "user": "mrbeam", "branch": "stable-1.2.2", - "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")) + "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), + "current": None }, "lcd": { "checkout_folder": "/home/pi/lcd", @@ -149,7 +151,8 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), - "restart": "environment" + "restart": "environment", + "current": None }, "netconnectd": { "checkout_folder": "/home/pi/netconnectd", @@ -158,7 +161,8 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), - "restart": "environment" + "restart": "environment", + "current": None }, }, From 27b755326ab79bcb9935676c6b89c6e625730883 Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 12:23:57 +0200 Subject: [PATCH 20/26] changed defualt value of current form None to Unknown --- src/octoprint/plugins/softwareupdate/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 5ab0f57e..5629c2c1 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -133,7 +133,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "branch": "grblautoupdate", "update_script": "{{python}} \"{update_script}\" --python=\"{{python}}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "update-octoprint.py")), "restart": "octoprint", - "current": None + "current": "Unknown" }, "svgtogcode": { "checkout_folder": "/home/pi/mrbeam-inkscape-ext", @@ -142,7 +142,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), - "current": None + "current": "Unknown" }, "lcd": { "checkout_folder": "/home/pi/lcd", @@ -152,7 +152,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), "restart": "environment", - "current": None + "current": "Unknown" }, "netconnectd": { "checkout_folder": "/home/pi/netconnectd", @@ -162,7 +162,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), "restart": "environment", - "current": None + "current": "Unknown" }, }, From 2f4e18fceb4a4cf7f9c7dc98cf3a5cc61f892df5 Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 14:07:21 +0200 Subject: [PATCH 21/26] added restart value None to svgtogcode update --- src/octoprint/plugins/softwareupdate/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 5629c2c1..9287d921 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -142,6 +142,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), + "restart": None "current": "Unknown" }, "lcd": { From b71f0a7cee24dde235a910b8d57af13a3b5172a1 Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 14:23:03 +0200 Subject: [PATCH 22/26] changed rastart value of svgtogcode to octoprint --- src/octoprint/plugins/softwareupdate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 9287d921..d8b74e6c 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -142,7 +142,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), - "restart": None + "restart": "octoprint" "current": "Unknown" }, "lcd": { From 3bf5540675a9e60152128e269c54b764dea871de Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 14:31:12 +0200 Subject: [PATCH 23/26] coma bug fix and back to None update type --- src/octoprint/plugins/softwareupdate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index d8b74e6c..040fb744 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -142,7 +142,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), - "restart": "octoprint" + "restart": None, "current": "Unknown" }, "lcd": { From 9c837b12660440856772c1bdd9c9afe36268cab9 Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 14:50:30 +0200 Subject: [PATCH 24/26] changed restart type to environment --- src/octoprint/plugins/softwareupdate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 040fb744..50a7c4b7 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -142,7 +142,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), - "restart": None, + "restart": "environment", "current": "Unknown" }, "lcd": { From 5bbae8336735b7c1e919c4c66f9a96bcfe013400 Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 15:35:07 +0200 Subject: [PATCH 25/26] changed restart to octoprint type --- src/octoprint/plugins/softwareupdate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 50a7c4b7..ef05d051 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -142,7 +142,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "user": "mrbeam", "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "git-pull.py")), - "restart": "environment", + "restart": "octoprint", "current": "Unknown" }, "lcd": { From c1355e4581c2f57db2b6eccb113a7ef4445a162a Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 15 Sep 2015 15:49:12 +0200 Subject: [PATCH 26/26] changed octoprint branch back to stable-1.2.2 and changed cache_ttl to 12 hours (12*60) --- src/octoprint/plugins/softwareupdate/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index ef05d051..3932db8c 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -130,7 +130,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "type": "github_commit", "repo": "OctoPrint", "user": "mrbeam", - "branch": "grblautoupdate", + "branch": "stable-1.2.2", "update_script": "{{python}} \"{update_script}\" --python=\"{{python}}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "update-octoprint.py")), "restart": "octoprint", "current": "Unknown" @@ -170,7 +170,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "octoprint_restart_command": "sudo service octoprint restart", "environment_restart_command": "sudo shutdown -r now", "pip_command": None, - "cache_ttl": 60, + "cache_ttl": 12 * 60, } def on_settings_load(self):