From 18c0dc6bf8f4d3c782ed822dedfdec7619ab29b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 17 Aug 2015 16:41:51 +0200
Subject: [PATCH] URL test API now also supports returning the response content

Also fixed a bunch of errors with that while at it.
---
 src/octoprint/server/api/__init__.py | 31 +++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/octoprint/server/api/__init__.py b/src/octoprint/server/api/__init__.py
index 9138c93e..170dbbac 100644
--- a/src/octoprint/server/api/__init__.py
+++ b/src/octoprint/server/api/__init__.py
@@ -317,6 +317,12 @@ def utilTestPath():
 				else:
 					return False
 
+			def as_dict(self):
+				return dict(
+					start=self.start,
+					end=self.end
+				)
+
 		status_ranges = dict(
 			informational=StatusCodeRange(start=100,end=200),
 			success=StatusCodeRange(start=200,end=300),
@@ -355,4 +361,27 @@ def utilTestPath():
 		except:
 			status = False
 
-		return jsonify(url=url, status=response.status_code, result=status)
+		result = dict(
+			url=url,
+			status=response.status_code,
+			result=status.as_dict() if isinstance(status, StatusCodeRange) else status
+		)
+
+		if "response" in data and (data["response"] in valid_boolean_trues or data["response"] in ("json", "bytes")):
+
+			import base64
+			content = base64.standard_b64encode(response.content)
+
+			if data["response"] == "json":
+				try:
+					content = response.json()
+				except:
+					logging.getLogger(__name__).exception("Couldn't convert response to json")
+					result["result"] = False
+
+			result["response"] = dict(
+				headers=dict(response.headers),
+				content=content
+			)
+
+		return jsonify(**result)