From ffc7417da6d81708a5b2c7f98d873879b292a7fc Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 26 Mar 2017 19:40:49 +0200
Subject: s/renderer: Extract json reformater method

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/service/renderer.php | 44 +++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/application/service/renderer.php b/application/service/renderer.php
index 66b6779a2..5da4cbd0a 100644
--- a/application/service/renderer.php
+++ b/application/service/renderer.php
@@ -34,22 +34,7 @@ class renderer {
 		$content = file_get_contents($file);
 
 		$linecount = count(explode("\n", $content));
-		if ($lexer === "json" && $linecount === 1) {
-			$decoded_json = json_decode($content);
-			if ($decoded_json !== null && $decoded_json !== false) {
-				$pretty_json = json_encode($decoded_json, JSON_PRETTY_PRINT);
-				if ($pretty_json !== false) {
-					$content = $pretty_json;
-					$this->output_cache->render_now(
-						array(
-							"error_type" => "alert-info",
-							"error_message" => "<p>The file below has been reformated for readability. It may differ from the original.</p>"
-						),
-						"file/fragments/alert-wide"
-					);
-				}
-			}
-		}
+		$content = $this->reformat_json($lexer, $linecount, $content);
 
 		if ($lexer == "ascii") {
 			// TODO: use exec safe and catch exception
@@ -165,5 +150,32 @@ class renderer {
 		$this->output_cache->render_now($data, 'file/html_paste_footer');
 	}
 
+	/**
+	 * @param $lexer
+	 * @param $linecount
+	 * @param $content
+	 * @return string
+	 */
+	private function reformat_json($lexer, $linecount, $content)
+	{
+		if ($lexer === "json" && $linecount === 1) {
+			$decoded_json = json_decode($content);
+			if ($decoded_json !== null && $decoded_json !== false) {
+				$pretty_json = json_encode($decoded_json, JSON_PRETTY_PRINT);
+				if ($pretty_json !== false) {
+					$content = $pretty_json;
+					$this->output_cache->render_now(
+						array(
+							"error_type" => "alert-info",
+							"error_message" => "<p>The file below has been reformated for readability. It may differ from the original.</p>"
+						),
+						"file/fragments/alert-wide"
+					);
+				}
+			}
+		}
+		return $content;
+	}
+
 
 }
-- 
cgit v1.2.3-24-g4f1b