From 20e1219d9ee3f2b50826151cd5e181439eeb870e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@octoprint.org>
Date: Wed, 1 Mar 2017 15:48:36 +0100
Subject: [PATCH] Virtual printer: configurable ok format

---
 src/octoprint/plugins/virtual_printer/virtual.py | 13 ++++++-------
 src/octoprint/settings.py                        |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/octoprint/plugins/virtual_printer/virtual.py b/src/octoprint/plugins/virtual_printer/virtual.py
index c60f0549..e231fb7a 100644
--- a/src/octoprint/plugins/virtual_printer/virtual.py
+++ b/src/octoprint/plugins/virtual_printer/virtual.py
@@ -109,6 +109,8 @@ class VirtualPrinter(object):
 
 		self._firmwareName = settings().get(["devel", "virtualPrinter", "firmwareName"])
 
+		self._okFormatString = settings().get(["devel", "virtualPrinter", "okFormatString"])
+
 		self.currentLine = 0
 		self.lastN = 0
 
@@ -1073,11 +1075,7 @@ class VirtualPrinter(object):
 	def _sendOk(self):
 		if self.outgoing is None:
 			return
-
-		if settings().getBoolean(["devel", "virtualPrinter", "okWithLinenumber"]):
-			self._send("{} {}".format(self._ok(), self.lastN))
-		else:
-			self._send(self._ok())
+		self._send(self._ok())
 
 	def _sendWaitAfterTimeout(self, timeout=5):
 		time.sleep(timeout)
@@ -1089,10 +1087,11 @@ class VirtualPrinter(object):
 			self.outgoing.put(line)
 
 	def _ok(self):
-		ok = "ok"
+		ok = self._okFormatString
 		if self._prepared_oks:
 			ok = self._prepared_oks.pop(0)
-		return ok
+
+		return ok.format(ok, lastN=self.lastN, buffer=self.buffered.maxsize - self.buffered.qsize())
 
 class CharCountingQueue(queue.Queue):
 
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index cedc2fc7..6640bbc1 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -335,7 +335,6 @@ default_settings = {
 			"enabled": False,
 			"okAfterResend": False,
 			"forceChecksum": False,
-			"okWithLinenumber": False,
 			"numExtruders": 1,
 			"includeCurrentToolInTemps": True,
 			"includeFilenameInOpened": True,
@@ -360,7 +359,8 @@ default_settings = {
 			"sharedNozzle": False,
 			"sendBusy": False,
 			"simulateReset": True,
-			"preparedOks": []
+			"preparedOks": [],
+			"okFormatString": "ok"
 		}
 	}
 }