cleaner builtin implementation

Author: alexcoder04

builtins.go

@@ -5,26 +5,18 @@ import (
 	"time"
 )
 
-func ExecuteBuiltIn(name string, args []string) []string {
-	switch name {
-	case "echo", "print":
-		return BuiltInEcho(args)
-	case "date", "time", "datetime":
-		return BuiltInDateTime(args)
-	}
-	return []string{" builtin not found"}
-}
-
-func BuiltInEcho(args []string) []string {
-	return []string{strings.Join(args, " ")}
-}
+var BuiltIns map[string]func([]string) []string = map[string]func([]string) []string{
+	"echo": func(args []string) []string {
+		return []string{strings.Join(args, " ")}
+	},
 
-func BuiltInDateTime(args []string) []string {
-	var format string
-	if len(args) < 1 {
-		format = "02.01.2006 (Mon) 15:04:05"
-	} else {
-		format = args[0]
-	}
-	return []string{time.Now().Format(format)}
+	"time": func(args []string) []string {
+		var format string
+		if len(args) < 1 {
+			format = "02.01.2006 (Mon) 15:04:05"
+		} else {
+			format = args[0]
+		}
+		return []string{time.Now().Format(format)}
+	},
 }

config.go

@@ -49,9 +49,9 @@ func DefaultConfig(msg string) Config {
 	config := Config{}
 	config.Modules = []Module{
 		{"msg", "", "#0000ff", "#ffff00", " ", "",
-			"echo", []string{msg}, 60, "none", true, 9, 0},
+			"*echo", []string{msg}, 60, "none", true, 9, 0},
 		{"time", "", "#ffffff", "#000000", " ", "",
-			"date", []string{"+%d.%m.%Y - %R:%S"}, 1, "none", true, 9, 0},
+			"*time", []string{}, 1, "none", true, 9, 0},
 		{"kernel", "", "#880088", "#ccccee", " ", "",
 			"uname", []string{"-r"}, 60, "none", true, 9, 0}}
 	return config

docs/Configuration.md

@@ -91,12 +91,11 @@ ForegroundColor
 BackgroundColor
 ```
 
-If the command starts with `*`, it is interpreted as a name of a built-in module.
-Those are:
+If the command starts with `*`, it is interpreted as a name of a built-in module. Those are:
 
- - `date` / `time` / `datetime`: the current date and time. Args: `["format"]`.
+ - `*time`: the current date and time. Args: `["format"]`.
    Format is in the Go time format fashion (`02.01.2006 (Mon) 15:04:05`).
- - `echo` / `print`: print some text. Args: `["text", "text", "text"]`
+ - `*echo`: print some text. Args: `["text", "text", ...]`
 
 Possible values: any executable on your system / any builtin.
 

events.go

@@ -56,32 +56,28 @@ func ReadInput() {
 func ListenFor(signalNumber int, blockName string) {
 	channel := make(chan os.Signal, 1)
 	signal.Notify(channel, syscall.Signal(SIGRTMIN+signalNumber))
-	select {
-	case <-channel:
-		mu.Lock()
-		UpdateModuleByName(blockName, 0, []string{})
-		draw()
-		mu.Unlock()
-		ListenFor(signalNumber, blockName)
-	}
+	<-channel
+	mu.Lock()
+	UpdateModuleByName(blockName, 0, []string{})
+	draw()
+	mu.Unlock()
+	ListenFor(signalNumber, blockName)
 }
 
 func ListenToReloadConfig() {
 	channel := make(chan os.Signal, 1)
 	signal.Notify(channel, syscall.Signal(syscall.SIGUSR1))
-	select {
-	case <-channel:
-		mu.Lock()
-		fmt.Printf(
-			`[{"full_text": "reloading config...", "color": "%s"}],`,
-			config.Colors["WHITE"])
-		config = LoadConfig()
-		for i := 0; i < len(config.Modules); i++ {
-			UpdateModule(i, 0, []string{})
-		}
-		draw()
-		mu.Unlock()
-
-		ListenToReloadConfig()
+	<-channel
+	mu.Lock()
+	fmt.Printf(
+		`[{"full_text": "reloading config...", "color": "%s"}],`,
+		config.Colors["WHITE"])
+	config = LoadConfig()
+	for i := 0; i < len(config.Modules); i++ {
+		UpdateModule(i, 0, []string{})
 	}
+	draw()
+	mu.Unlock()
+
+	ListenToReloadConfig()
 }

update.go

@@ -62,7 +62,7 @@ func UpdateModule(mod int, counter int, env []string) {
 
 	var lines []string
 	if config.Modules[mod].Command[0] == '*' {
-		lines = ExecuteBuiltIn(config.Modules[mod].Command[1:], config.Modules[mod].Args)
+		lines = BuiltIns[config.Modules[mod].Command[1:]](config.Modules[mod].Args)
 	} else {
 		lines = ExecuteCommand(config.Modules[mod].Command, config.Modules[mod].Args, env)
 	}