From cc8dcef8a1a46dc35377bb56e5504c8a682f2929 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

---
 src/octoprint/server/util/sockjs.py        | 1 +
 src/octoprint/server/views.py              | 3 ++-
 src/octoprint/static/js/app/dataupdater.js | 1 +
 src/octoprint/templates/initscript.jinja2  | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/server/util/sockjs.py b/src/octoprint/server/util/sockjs.py
index 44b682f8..452a07cd 100644
--- a/src/octoprint/server/util/sockjs.py
+++ b/src/octoprint/server/util/sockjs.py
@@ -66,6 +66,7 @@ class PrinterStateConnection(sockjs.tornado.SockJSConnection, octoprint.printer.
 			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(),
 			config_hash=config_hash
 		))
diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py
index e4661c68..8a9d0c34 100644
--- a/src/octoprint/server/views.py
+++ b/src/octoprint/server/views.py
@@ -13,7 +13,7 @@ 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
+	debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY, BRANCH
 from octoprint.settings import settings
 
 from . import util
@@ -311,6 +311,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 52c880c0..52293417 100644
--- a/src/octoprint/static/js/app/dataupdater.js
+++ b/src/octoprint/static/js/app/dataupdater.js
@@ -113,6 +113,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 5d972f30..28bf8eb5 100644
--- a/src/octoprint/templates/initscript.jinja2
+++ b/src/octoprint/templates/initscript.jinja2
@@ -22,11 +22,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 }};