fix: WASM build not using TrueColor

BigJk · Aug 25, 2024 · 475190c · 475190c
1 parent 312c3db
commit 475190c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/system/image/image.go b/system/image/image.go
@@ -5,11 +5,6 @@ package image
 import (
 	"bytes"
 	"errors"
-	"github.com/BigJk/end_of_eden/internal/fs"
-	"github.com/BigJk/imeji"
-	"github.com/BigJk/imeji/charmaps"
-	"github.com/charmbracelet/log"
-	"github.com/muesli/termenv"
 	"image"
 	"image/draw"
 	"image/gif"
@@ -19,6 +14,12 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"github.com/BigJk/end_of_eden/internal/fs"
+	"github.com/BigJk/imeji"
+	"github.com/BigJk/imeji/charmaps"
+	"github.com/charmbracelet/log"
+	"github.com/muesli/termenv"
 )
 
 // TODO: Better decoupling in relation to session
@@ -52,21 +53,21 @@ func buildOption(options ...Option) (Options, []imeji.Option) {
 	if runtime.GOOS == "js" {
 		imejiOptions = append(imejiOptions, imeji.WithTrueColor())
 		data.tag += "truecolor"
-	}
-
-	switch termenv.DefaultOutput().Profile {
-	case termenv.TrueColor:
-		imejiOptions = append(imejiOptions, imeji.WithTrueColor())
-		data.tag += "truecolor"
-	case termenv.ANSI:
-		imejiOptions = append(imejiOptions, imeji.WithANSI())
-		data.tag += "ansi"
-	case termenv.ANSI256:
-		imejiOptions = append(imejiOptions, imeji.WithANSI256())
-		data.tag += "ansi256"
-	default:
-		// TODO: should this be the default fallback?
-		imejiOptions = append(imejiOptions, imeji.WithTrueColor())
+	} else {
+		switch termenv.DefaultOutput().Profile {
+		case termenv.TrueColor:
+			imejiOptions = append(imejiOptions, imeji.WithTrueColor())
+			data.tag += "truecolor"
+		case termenv.ANSI:
+			imejiOptions = append(imejiOptions, imeji.WithANSI())
+			data.tag += "ansi"
+		case termenv.ANSI256:
+			imejiOptions = append(imejiOptions, imeji.WithANSI256())
+			data.tag += "ansi256"
+		default:
+			// TODO: should this be the default fallback?
+			imejiOptions = append(imejiOptions, imeji.WithTrueColor())
+		}
 	}
 
 	// Build image options

diff --git a/ui/menus/mainmenu/choices.go b/ui/menus/mainmenu/choices.go
@@ -1,6 +1,8 @@
 package mainmenu
 
 import (
+	"runtime"
+
 	"github.com/BigJk/end_of_eden/system/audio"
 	"github.com/BigJk/end_of_eden/ui/style"
 	"github.com/charmbracelet/bubbles/list"
@@ -49,6 +51,13 @@ func NewChoicesModel(zones *zone.Manager, hideSettings bool) ChoicesModel {
 		choiceItem{zones, "Exit", "Got enough already?", ChoiceExit},
 	}
 
+	// Hide exit on web
+	if runtime.GOOS == "js" {
+		choices = lo.Filter(choices, func(value list.Item, i int) bool {
+			return value.(choiceItem).title != "Exit" || value.(choiceItem).title == "Mods"
+		})
+	}
+
 	if hideSettings {
 		choices = lo.Filter(choices, func(value list.Item, i int) bool {
 			return value.(choiceItem).key != ChoiceSettings