Add the sevent seg hole

JRaspass · JRaspass · commit 7d34727479bd · 2017-08-28T00:41:32.000+01:00
diff --git a/code-golf.go b/code-golf.go
@@ -17,6 +17,7 @@ import (
 	"strings"
 	"syscall"
 	"time"
+	"unicode"
 )
 
 const base = "views/base.html"
@@ -133,6 +134,9 @@ func codeGolf(w http.ResponseWriter, r *http.Request) {
 
 				// Drop the trailing newline.
 				out.Exp = out.Exp[:len(out.Exp)-1]
+			} else if in.Hole == "seven-segment" {
+				args = make([]string, 1)
+				args[0], out.Exp = sevenSegment()
 			} else {
 				out.Exp = answers[in.Hole]
 			}
@@ -265,6 +269,9 @@ func runCode(lang, code string, args []string) (string, string) {
 	switch lang {
 	case "javascript":
 		cmd.Args = []string{"/usr/bin/js", "-f", "-", "--"}
+	// The perls seems to show -- in @ARGV :-(
+	case "perl":
+		cmd.Args = []string{"/usr/bin/perl", "-"}
 	case "perl6":
 		cmd.Args = []string{
 			"/usr/bin/moar",
@@ -294,5 +301,6 @@ func runCode(lang, code string, args []string) (string, string) {
 
 	timer.Stop()
 
-	return string(bytes.TrimSpace(err.Bytes())), string(bytes.TrimSpace(out.Bytes()))
+	return string(bytes.TrimRightFunc(err.Bytes(), unicode.IsSpace)),
+		string(bytes.TrimRightFunc(out.Bytes(), unicode.IsSpace))
 }
diff --git a/preambles.go b/preambles.go
@@ -5,13 +5,15 @@ var intros = map[string]string{
 	"arabic-to-roman-numerals": `<div class="int hole"><a href=arabic-to-roman-numerals>Arabic to Roman<p>Convert Hindu–Arabic numerals to Roman numerals…</p></a><table>`,
 	"fizz-buzz":                `<div class="beg hole"><a href=fizz-buzz>Fizz Buzz<p>Write a program that prints the numbers from 1 to 100…</p></a><table>`,
 	"pascals-triangle":         `<div class="int hole"><a href=pascals-triangle>Pascal's Triangle<p>Blaise Pascal's arithmetic and geometric figure…</p></a><table>`,
+	"seven-segment":            `<div class="int hole"><a href=seven-segment>Seven Segment<p>Using pipes and underscores print a seven segment display…</p></a><table>`,
 	"π":                        `<div class="adv hole"><a href=π>π<p>The ratio of a circle's circumference to its diameter…</p></a><table>`,
 }
 
 var preambles = map[string]string{
-	"99-bottles-of-beer": `<h1>99 Bottles of Beer</h1><p>Print the lyrics to the song 99 Bottles of Beer.</p>`,
+	"99-bottles-of-beer":       `<h1>99 Bottles of Beer</h1><p>Print the lyrics to the song 99 Bottles of Beer.</p>`,
 	"arabic-to-roman-numerals": `<h1>Arabic to Roman Numerals</h1><p>For each arabic number argument print the same number in roman numerals.</p>`,
-	"fizz-buzz": `<h1>Fizz Buzz</h1><p>Print the numbers from <b>1</b> to <b>100</b> (inclusive), each on their own line.</p><p>If, however, the number is a multiple of <b>three</b> then print <b>Fizz</b> instead, and if the number is a multiple of <b>five</b> then print <b>Buzz</b>.</p><p>For numbers which are multiples of <b>both three and five</b> then print <b>FizzBuzz</b>.</p>`,
-	"pascals-triangle": `<h1>Pascal's Triangle</h1><p>Print the first <b>20 rows</b> of Pascal's triangle.</p>`,
-	"π": `<h1>π</h1><p>Print π (Pi) to the first 1,000 decimal places.</p>`,
+	"fizz-buzz":                `<h1>Fizz Buzz</h1><p>Print the numbers from <b>1</b> to <b>100</b> (inclusive), each on their own line.</p><p>If, however, the number is a multiple of <b>three</b> then print <b>Fizz</b> instead, and if the number is a multiple of <b>five</b> then print <b>Buzz</b>.</p><p>For numbers which are multiples of <b>both three and five</b> then print <b>FizzBuzz</b>.</p>`,
+	"pascals-triangle":         `<h1>Pascal's Triangle</h1><p>Print the first <b>20 rows</b> of Pascal's triangle.</p>`,
+	"seven-segment":            `<h1>Seven Segment</h1>`,
+	"π":                        `<h1>π</h1><p>Print π (Pi) to the first 1,000 decimal places.</p>`,
 }
diff --git a/seven-segment.go b/seven-segment.go
@@ -0,0 +1,37 @@
+package main
+
+import (
+	"math/rand"
+	"strings"
+	"unicode"
+)
+
+var segments = [][]string{
+	{" _ ", "   ", " _ ", " _ ", "   ", " _ ", " _ ", " _ ", " _ ", " _ "},
+	{"| |", "  |", " _|", " _|", "|_|", "|_ ", "|_ ", "  |", "|_|", "|_|"},
+	{"|_|", "  |", "|_ ", " _|", "  |", " _|", "|_|", "  |", "|_|", " _|"},
+}
+
+func sevenSegment() (input, output string) {
+	digits := []byte{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}
+
+	// Shuffle the digits
+	for i := range digits {
+		j := rand.Intn(i + 1)
+		digits[i], digits[j] = digits[j], digits[i]
+	}
+
+	input = string(digits)
+
+	for row := 0; row < 3; row++ {
+		for _, digit := range digits {
+			output += segments[row][digit-'0']
+		}
+
+		output += "\n"
+	}
+
+	output = strings.TrimRightFunc(output, unicode.IsSpace)
+
+	return
+}
