GenerateRandomAlias: return error with a random English name

ilius · Oct 31, 2024 · ae0beb4 · ae0beb4
1 parent 277922c
commit ae0beb4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/cmd/localsend-go/main.go b/cmd/localsend-go/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"log/slog"
 	"os"
 
 	"github.com/ilius/localsend-go/pkg/config"
@@ -14,16 +13,16 @@ import (
 )
 
 func main() {
+	noColor := os.Getenv("NO_COLOLR") != ""
+	logger := logging.SetupLogger(noColor, logging.DefaultLevel)
+
 	defer func() {
 		r := recover()
 		if r != nil {
-			slog.Error(fmt.Sprintf("%v", r))
+			logger.Error(fmt.Sprintf("%v", r))
 		}
 	}()
 
-	noColor := os.Getenv("NO_COLOLR") != ""
-	logger := logging.SetupLogger(noColor, logging.DefaultLevel)
-
 	_flags := parseFlags()
 
 	conf := config.Init()
@@ -38,12 +37,12 @@ func main() {
 	if _flags.ReceiveMode {
 		srv := server.New(conf, logger)
 		srv.StartHttpServer()
-		slog.Info("Waiting to receive files...")
+		logger.Info("Waiting to receive files...")
 		select {} // Blocking program waiting to receive file
 	} else {
 		err := send.SendFile(conf, _flags.ToDevice, _flags.FilePath)
 		if err != nil {
-			slog.Error("Send failed", "err", err)
+			logger.Error("Send failed", "err", err)
 		}
 	}
 }
diff --git a/pkg/alias/random_alias.go b/pkg/alias/random_alias.go
@@ -2,7 +2,7 @@ package alias
 
 import (
 	"crypto/rand"
-	"log/slog"
+	"fmt"
 	"math/big"
 
 	"github.com/ilius/localsend-go/pkg/alias/en"
@@ -26,16 +26,14 @@ func genAlias(lang LangInterface) string {
 	return lang.Combination(adjectives[randomInt(len(adjectives))], fruits[randomInt(len(fruits))])
 }
 
-func GenerateRandomAlias(lang string) string {
+func GenerateRandomAlias(lang string) (string, error) {
 	switch lang {
 	case "", "en":
-		return genAlias(_en)
+		return genAlias(_en), nil
 	case "fa":
-		return genAlias(_fa)
-	default:
-		slog.Error("unsupported language name", "lang", lang)
+		return genAlias(_fa), nil
 	}
-	return genAlias(_en)
+	return genAlias(_en), fmt.Errorf("unsupported language name %#v", lang)
 }
 
 // randomInt returns a uniform random value in [0, max). It panics if max <= 0.

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -13,6 +13,8 @@ import (
 
 const fileName = "config.toml"
 
+// const fallbackAlias = "Unknown"
+
 //go:embed config.toml
 var embedFS embed.FS
 
@@ -74,7 +76,10 @@ func Init() *Config {
 		slog.Info("Loaded user config file", "configData", conf)
 	}
 	if conf.NameOfDevice == "" {
-		name := alias.GenerateRandomAlias(conf.NameLanguage)
+		name, err := alias.GenerateRandomAlias(conf.NameLanguage)
+		if err != nil {
+			slog.Error(err.Error())
+		}
 		slog.Info("Using random name/alias: ", "name", name)
 		conf.NameOfDevice = name
 	}