Better kamoulox

Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>

Author: jeanlaurent

Dockerfile

@@ -1,9 +1,14 @@
-FROM golang:1.23.1 AS gobuilder
-WORKDIR /go/src/github.com/jeanlaurent/kamoulox
-COPY . ./
-RUN go build .
+FROM golang:1.23.4-alpine AS gobuilder
+WORKDIR /src
+COPY go.mod ./
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
+COPY . /src/
+RUN --mount=type=cache,target=/root/.cache \
+    --mount=type=cache,target=/go/pkg/mod \
+    go build -o kamoulox cmd/kamoulox/*.go
 
 FROM scratch
 WORKDIR /app
-COPY --from=gobuilder /go/src/github.com/jeanlaurent/kamoulox /app/
-ENTRYPOINT ["./kamoulox"]
+COPY --from=gobuilder /src/kamoulox /app/
+ENTRYPOINT ["./kamoulox"]

go.mod

@@ -1,3 +1,3 @@
 module github.com/jeanlaurent/kamoulox
 
-go 1.23
+go 1.23.4

main

@@ -2,15 +2,36 @@ package kamoulox
 
 import (
 	"fmt"
+	"strings"
 	"unicode"
 
 	"math/rand"
 )
 
 func GenerateKamoulox() string {
-	firstVerb := randomElementFrom(verbs)
-	firstObject := randomElementFrom(objects)
-	return fmt.Sprintf("%s %s et %s %s.", capitalizeFirst(firstVerb), firstObject, randomElementFromExcluding(verbs, firstVerb), randomElementFromExcluding(objects, firstObject))
+	numPairs := rand.Intn(3) + 2 // Generate between 2 and 4 pairs
+	usedVerbs := make([]string, 0, numPairs)
+	usedObjects := make([]string, 0, numPairs)
+	pairs := make([]string, 0, numPairs)
+
+	for i := 0; i < numPairs; i++ {
+		verb := randomElementFromExcluding(verbs, usedVerbs...)
+		object := randomElementFromExcluding(objects, usedObjects...)
+		usedVerbs = append(usedVerbs, verb)
+		usedObjects = append(usedObjects, object)
+		if i == 0 {
+			verb = capitalizeFirst(verb)
+		} else {
+			verb = strings.TrimPrefix(verb, "je ")
+			verb = strings.TrimPrefix(verb, "j'")
+		}
+		pair := fmt.Sprintf("%s %s", verb, object)
+		pairs = append(pairs, pair)
+	}
+
+	sentence := strings.Join(pairs[:len(pairs)-1], ", ")
+	sentence += " et " + pairs[len(pairs)-1] + "."
+	return sentence
 }
 
 func randomElementFrom(array []string) string {
@@ -23,11 +44,18 @@ func capitalizeFirst(str string) string {
 	}
 	return ""
 }
-
-func randomElementFromExcluding(array []string, toExclude string) string {
-	found := array[rand.Intn(len(array))]
-	if found != toExclude {
-		return found
+func randomElementFromExcluding(array []string, toExclude ...string) string {
+	for {
+		found := array[rand.Intn(len(array))]
+		exclude := false
+		for _, ex := range toExclude {
+			if found == ex {
+				exclude = true
+				break
+			}
+		}
+		if !exclude {
+			return found
+		}
 	}
-	return randomElementFromExcluding(array, toExclude)
 }

pkg/kamoulox/kamoulox.go

@@ -55,4 +55,34 @@ var objects = []string{
 	"Clint Eastwood",
 	"Danny Boon",
 	"Donald Trump",
+	"un marteau",
+	"une enclume",
+	"une boîte à outils",
+	"un dragon",
+	"une lampe torche",
+	"une tarte aux pommes",
+	"un pingouin",
+	"un panda",
+	"un yaourt",
+	"une cuillère",
+	"une peluche",
+	"un frisbee",
+	"un ballon de foot",
+	"une raquette de tennis",
+	"un parasol",
+	"une chaise longue",
+	"un extincteur",
+	"un thermos",
+	"un sac à dos",
+	"une boussole",
+	"un vélo",
+	"un parapluie",
+	"une machine à écrire",
+	"un robot",
+	"un hologramme",
+	"une éponge",
+	"un coussin",
+	"un tapis volant",
+	"un chapeau melon",
+	"un fauteuil roulant",
 }

pkg/kamoulox/objects.go

@@ -50,4 +50,34 @@ var verbs = []string{
 	"je dessine",
 	"je teleporte",
 	"j'observe",
+	"je grimpe sur",
+	"je nage dans",
+	"je m'accroche à",
+	"je collectionne",
+	"je jongle avec",
+	"je lance",
+	"je détruis",
+	"je fabrique",
+	"je peins",
+	"je sculpte",
+	"je rampe sous",
+	"je médite sur",
+	"je capture",
+	"je délivre",
+	"je rends hommage à",
+	"je déplace",
+	"je souffle sur",
+	"je contemple",
+	"je secoue",
+	"je ralentis",
+	"je répare",
+	"je rassemble",
+	"je déterre",
+	"je construis",
+	"je m'envole avec",
+	"je réchauffe",
+	"je refroidis",
+	"je protège",
+	"je remixe",
+	"je réinvente",
 }