fixe app test and typo suggested by @MonsieurV

kpym · Aug 21, 2021 · 6aadee8 · 6aadee8
1 parent 3d348f8
commit 6aadee8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/app/app.go b/app/app.go
@@ -123,7 +123,9 @@ func GetParameters(params *builder.Parameters) error {
 	// the default writer is os.Stdout (color.Output)
 	params.Log = log.New(log.WithLevel(level), log.WithColor())
 
-	// Chack if the service support the requested options.
+	// normalise the service name
+	params.Service = strings.ToLower(params.Service)
+	// chack if the service support the requested options
 	if !stringIn(params.Service, "laton", "ytotech", "") {
 		return fmt.Errorf("Unknown %s service.", params.Service)
 	}
@@ -155,7 +157,7 @@ func GetParameters(params *builder.Parameters) error {
 		params.PipedMain = ((fi.Mode() & os.ModeCharDevice) == 0) && (fi.Mode()&os.ModeNamedPipe != 0)
 		params.Log.Debug("Piped input: %v, Stdin mode: %v.", params.PipedMain, fi.Mode())
 	}
-	// Get the patterns
+	// get the patterns
 	params.Patterns = append(pflag.Args(), params.Patterns...)
 	if len(params.Patterns) == 0 && params.Main == "" && !params.PipedMain {
 		return fmt.Errorf("Missing file to compile.")

diff --git a/app/app_test.go b/app/app_test.go
@@ -4,11 +4,12 @@ import (
 	"testing"
 
 	"github.com/kpym/lol/builder"
+	"github.com/kpym/lol/log"
 )
 
 func TestGetFiles(t *testing.T) {
 	// no Main, no Patterns
-	params := builder.Parameters{}
+	params := builder.Parameters{Log: log.New()}
 	files, err := GetFiles(params)
 
 	// Check for error

diff --git a/builder/ytotech/ytotech.go b/builder/ytotech/ytotech.go
@@ -93,9 +93,9 @@ func (y *ytotech) BuildPDF(req builder.Request) ([]byte, error) {
 		var comperr compilationError
 		err = json.Unmarshal(respBody, &comperr)
 		if err != nil {
-			return nil, fmt.Errorf("Laton compilation error (status code %d). The answer is not a valid json:\n%s\n", resp.StatusCode, respBody)
+			return nil, fmt.Errorf("YtoTech compilation error (status code %d). The answer is not a valid json:\n%s\n", resp.StatusCode, respBody)
 		}
-		return nil, fmt.Errorf("Laton compilation error (status code %d):\n%s\n", resp.StatusCode, comperr.Logs)
+		return nil, fmt.Errorf("YtoTech compilation error (status code %d):\n%s\n", resp.StatusCode, comperr.Logs)
 	}
 
 	// respBody contains the resulting pdf

diff --git a/main.go b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"time"
 
@@ -39,10 +40,13 @@ func main() {
 
 	// build the pdf
 	var compiler builder.Builder
-	if params.Service == "ytotech" {
+	switch params.Service {
+	case "ytotech":
 		compiler = ytotech.NewBuilder()
-	} else {
+	case "laton":
 		compiler = laton.NewBuilder()
+	default:
+		check(params.Log, fmt.Errorf("Unknown service %s", params.Service))
 	}
 	req := builder.Request{Parameters: params, Files: files}
 	params.Log.Info("Send request with the following parameters:\n%s", req.String())