From fc63f9538535699351279893d9be2f0851755453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 26 Aug 2015 15:25:16 +0200
Subject: [PATCH] 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 }};