From 71f0d462f2d695acb4126adfd50f92c8b3ab8bc2 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sat, 28 Mar 2015 00:40:33 +0100 Subject: Refactor \libraries\Pygments::get_lexers Signed-off-by: Florian Pritz --- application/libraries/Pygments.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'application/libraries') diff --git a/application/libraries/Pygments.php b/application/libraries/Pygments.php index ddddf40d9..ab3868087 100644 --- a/application/libraries/Pygments.php +++ b/application/libraries/Pygments.php @@ -20,14 +20,23 @@ class Pygments { $this->filename = $filename; } + private static function get_pygments_info() { + return cache_function('pygments_info', 1800, function() { + ob_start(); + passthru("python ".escapeshellarg(FCPATH."scripts/get_lexer_list.py")); + $output = ob_get_clean(); + + return json_decode($output, true); + }); + } + public static function get_lexers() { return cache_function('lexers', 1800, function() { - $lexers = array(); $last_desc = ""; - exec("python ".escapeshellarg(FCPATH."scripts/get_lexer_list.py"), $output); - foreach ($output as $line) { - list($name, $desc) = explode("|", $line); + foreach (self::get_pygments_info() as $lexer) { + $desc = $lexer['fullname']; + $name = $lexer['names'][0]; if ($desc == $last_desc) { continue; } -- cgit v1.2.3-24-g4f1b