From 01da9a40e69b22e18886d56dd5b90ca9ef488911 Mon Sep 17 00:00:00 2001 From: spf13 Date: Fri, 10 Jan 2014 12:50:31 -0500 Subject: [PATCH] =?UTF-8?q?Report=20error,=20but=20don=E2=80=99t=20fatally?= =?UTF-8?q?=20stop=20if=20pygments=20has=20error.=20Return=20original=20st?= =?UTF-8?q?ring.=20(+1=20squashed=20commit)=20Squashed=20commits:=20[849a7?= =?UTF-8?q?af]=20if=20highlighting=20doesn=E2=80=99t=20work,=20just=20retu?= =?UTF-8?q?rn=20original=20string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helpers/pygments.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/helpers/pygments.go b/helpers/pygments.go index 6b912fc1a..7d22faf7d 100644 --- a/helpers/pygments.go +++ b/helpers/pygments.go @@ -14,32 +14,32 @@ package helpers import ( - "bytes" - "log" - "os/exec" - "strings" + "bytes" + "log" + "os/exec" + "strings" ) func Highlight(code string, lexer string) string { - var pygmentsBin = "pygmentize" + var pygmentsBin = "pygmentize" - if _, err := exec.LookPath(pygmentsBin); err != nil { - log.Print("Highlighting requries Pygments to be installed and in the path") - return code - } + if _, err := exec.LookPath(pygmentsBin); err != nil { + log.Print("Highlighting requries Pygments to be installed and in the path") + return code + } - var out bytes.Buffer - var stderr bytes.Buffer + var out bytes.Buffer + var stderr bytes.Buffer - cmd := exec.Command(pygmentsBin, "-l"+lexer, "-fhtml", "-O style=monokai,noclasses=true,encoding=utf-8") - cmd.Stdin = strings.NewReader(code) - cmd.Stdout = &out - cmd.Stderr = &stderr + cmd := exec.Command(pygmentsBin, "-l"+lexer, "-fhtml", "-O style=monokai,noclasses=true,encoding=utf-8") + cmd.Stdin = strings.NewReader(code) + cmd.Stdout = &out + cmd.Stderr = &stderr - if err := cmd.Run(); err != nil { - log.Print(stderr.String()) - log.Fatal(err) - } + if err := cmd.Run(); err != nil { + log.Print(stderr.String()) + return code + } - return out.String() + return out.String() }