Finally fix parsing of app buttons, now settings and fallback values should work as expected

cmd/i3status-go/default-config.json

@@ -2,7 +2,7 @@
 // Default text and *block* border colors. If not set #3e78fd is used.
 "color" : "#3e78fd",
 
-// Default backbround color. If not set value of #edeceb is used.
+// Default background color. If not set value of #edeceb is used.
 "background" : "#000000",
 
 // Can be omitted, then Liberation Mono will be used.
@@ -778,6 +778,19 @@
 "app_buttons": {
 	"enabled": true,
 
+	// If omitted set to default color defined up here.
+	"color": "#3e78fd",
+
+	// If omitted set to default background color defined up here.
+	"background": "#000000",
+
+	// If omitted set to default font defined up here.
+	"font": "Noto Sans",
+
+	// ‘xx-small’, ‘x-small’, ‘small’, ‘medium’, ‘large’, ‘x-large’, ‘xx-large’,  or one of relative sizes
+	// ‘smaller’ or ‘larger’. If omitted set to default font size defined up here.
+	"font_size": "medium",
+
 	// Re-define separator parameters for net-if block here.
 	"separator": {
 		"left": {
@@ -821,31 +834,36 @@
 			// ‘smaller’ or ‘larger’. If omitted set to default font size defined for separator up here.
 			"font_size": "medium"
 		}
-	},
+	}
 },
 
 // Buttons - application launch "buttons"
 "apps": [
 		{
-			// Text dispalyed on button
+			// Text displayed on button, pango markup supported.
 			"full_text" : "📂",
-			// Internal name, can be any string, but unique for each app button
+			// Internal name, can be any string, but unique for each app button.
 			"name" : "thunar",
-			// Command itself
+			// Command itself.
 			"cmd" : "thunar",
-			// Array of command args, optional
+			// Array of command args, optional.
 			"args": [ "." ],
-			// Regexp that match with Instance component of WM_CLASS(STRING) of xprop output
+			// Regexp that match with Instance component of WM_CLASS(STRING) of xprop output.
 			"instance": "^thunar$",
-			// Regexp that match with Class component of WM_CLASS(STRING) of xprop output
+			// Regexp that match with Class component of WM_CLASS(STRING) of xprop output.
 			"class": "^Thunar$",
-			// text color in html notation
+			// Text color in html notation.
 			"color": "#ffa500",
-			// background color in html notation
+			// background color in html notation.
 			"background" : "#000000",
-			// border color in html notation
+			// If omitted set to default font defined for app_buttons up here.
+			"font": "Noto Sans",
+			// ‘xx-small’, ‘x-small’, ‘small’, ‘medium’, ‘large’, ‘x-large’, ‘xx-large’,  or one of relative sizes
+			// ‘smaller’ or ‘larger’. If omitted set to default font size defined for app_buttons up here.
+			"font_size": "medium",
+			// Border color in html notation.
 			"border": "#666666",
-			// border color if there is at least one window with given Instance and/or Class exist
+			// Border color if there is at least one window with given Instance and/or Class exist.
 			"border_active": "#3e78fd",
 			// Vertical line between objects on bar - if omitted true value is assumed by i3bar, but we set it to false
 			// in that case. It is limitation of golang json parser.

cmd/i3status-go/main.go

@@ -192,7 +192,14 @@ func main() {
 					)
 				}
 
-				b.FullText = app.FullText
+				b.FullText = fmt.Sprintf(
+					"<span color='%s' background='%s' font='%s' size='%s'>%s</span>",
+					app.Color,
+					app.Background,
+					app.Font,
+					app.FontSize,
+					app.FullText,
+				)
 
 				if num == len(Conf.Apps) {
 					b.FullText = fmt.Sprintf(
@@ -205,8 +212,6 @@ func main() {
 					)
 				}
 
-				b.Background = app.Background
-				b.Color = app.Color
 				b.Instance = app.Instance
 				b.Markup = `pango`
 				b.Separator = app.Separator

internal/lib/config.go

@@ -21,6 +21,8 @@ type I3BarOutBlock struct {
 	ShortText    string `json:"short_text,omitempty"`
 	Color        string `json:"color,omitempty"`
 	Background   string `json:"background,omitempty"`
+	Font         string `json:"font,omitempty"`
+	FontSize     string `json:"font_size,omitempty"`
 	Border       string `json:"border,omitempty"`
 	BorderTop    int    `json:"border_top"`
 	BorderRight  int    `json:"border_right"`
@@ -246,6 +248,10 @@ type MyConfig struct {
 
 	AppButtons struct {
 		Enabled    bool      `json:"enabled,omitempty"`
+		Color      string    `json:"color,omitempty"`
+		Background string    `json:"background,omitempty"`
+		Font       string    `json:"font,omitempty"`
+		FontSize   string    `json:"font_size,omitempty"`
 		Separator  Separator `json:"separator,omitempty"`
 	} `json:"app_buttons,omitempty"`
 
@@ -258,6 +264,8 @@ type MyConfig struct {
 		Class               string   `json:"class,omitempty"`
 		Color               string   `json:"color,omitempty"`
 		Background          string   `json:"background,omitempty"`
+		Font                string   `json:"font,omitempty"`
+		FontSize            string   `json:"font_size,omitempty"`
 		Border              string   `json:"border,omitempty"`
 		BorderActive        string   `json:"border_active,omitempty"`
 		Separator           bool     `json:"separator,omitempty"`
@@ -464,6 +472,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.LA.FontSize == "" {
 		sampleConfig.LA.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.LA.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.LA.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.LA.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.LA.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.LA.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.LA.Separator.Left.Color == "" {
@@ -518,22 +550,6 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 		sampleConfig.LA.Separator.Right.Background = sampleConfig.Separator.Right.Background
 	}
 
-	if sampleConfig.LA.Separator.Right.Font == "" {
-		sampleConfig.LA.Separator.Right.Font = sampleConfig.Separator.Right.Font
-	}
-
-	if sampleConfig.LA.Separator.Right.FontSize == "" {
-		sampleConfig.LA.Separator.Right.FontSize = sampleConfig.Separator.Right.FontSize
-	}
-
-	if sampleConfig.LA.Separator.Right.Color == "" {
-		sampleConfig.LA.Separator.Right.Color = sampleConfig.Separator.Right.Color
-	}
-
-	if sampleConfig.LA.Separator.Right.Background == "" {
-		sampleConfig.LA.Separator.Right.Background = sampleConfig.Separator.Right.Background
-	}
-
 	if sampleConfig.LA.Separator.Right.Symbol == "" {
 		sampleConfig.LA.Separator.Right.Symbol = sampleConfig.Separator.Right.Symbol
 	}
@@ -584,6 +600,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.Mem.FontSize == "" {
 		sampleConfig.Mem.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.Mem.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.Mem.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Mem.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.Mem.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Mem.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.Mem.Separator.Left.Color == "" {
@@ -688,6 +728,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.Clock.FontSize == "" {
 		sampleConfig.Clock.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.Clock.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.Clock.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Clock.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.Clock.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Clock.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.Clock.Separator.Left.Enabled {
@@ -816,6 +880,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.Battery.FontSize == "" {
 		sampleConfig.Battery.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.Battery.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.Battery.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Battery.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.Battery.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Battery.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.Battery.Symbol == "" {
@@ -828,6 +916,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.Battery.SymbolFontSize == "" {
 		sampleConfig.Battery.SymbolFontSize = sampleConfig.Battery.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.Battery.SymbolFontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.Battery.SymbolFontSize: %s, fallback to %s",
+				err,
+				sampleConfig.Battery.FontSize,
+			)
+
+			sampleConfig.Battery.SymbolFontSize = sampleConfig.Battery.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.Battery.SymbolFontSize, fallback to %s",
+				sampleConfig.Battery.FontSize,
+			)
+
+			sampleConfig.Battery.SymbolFontSize = sampleConfig.Battery.FontSize
+		}
 	}
 
 	// sampleConfig.Battery.ChargeColor.Full will be empty string if not set
@@ -943,6 +1055,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.CPUTemp.FontSize == "" {
 		sampleConfig.CPUTemp.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.CPUTemp.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.CPUTemp.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.CPUTemp.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.CPUTemp.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.CPUTemp.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.CPUTemp.Separator.Left.Enabled {
@@ -1054,6 +1190,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.Vpn.FontSize == "" {
 		sampleConfig.Vpn.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.Vpn.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.Vpn.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Vpn.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.Vpn.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.Vpn.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	// Check status file at least once per 3 seconds
@@ -1198,6 +1358,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.SimpleVolumePa.FontSize == "" {
 		sampleConfig.SimpleVolumePa.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.SimpleVolumePa.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.SimpleVolumePa.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.SimpleVolumePa.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.SimpleVolumePa.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.SimpleVolumePa.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.SimpleVolumePa.Symbol == "" {
@@ -1210,6 +1394,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.SimpleVolumePa.SymbolFontSize == "" {
 		sampleConfig.SimpleVolumePa.SymbolFontSize = sampleConfig.SimpleVolumePa.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.SimpleVolumePa.SymbolFontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.SimpleVolumePa.SymbolFontSize: %s, fallback to %s",
+				err,
+				sampleConfig.SimpleVolumePa.FontSize,
+			)
+
+			sampleConfig.SimpleVolumePa.SymbolFontSize = sampleConfig.SimpleVolumePa.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.SimpleVolumePa.SymbolFontSize, fallback to %s",
+				sampleConfig.SimpleVolumePa.FontSize,
+			)
+
+			sampleConfig.SimpleVolumePa.SymbolFontSize = sampleConfig.SimpleVolumePa.FontSize
+		}
 	}
 
 	if sampleConfig.SimpleVolumePa.Step == 0 {
@@ -1370,6 +1578,29 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.NetIf.FontSize == "" {
 		sampleConfig.NetIf.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.NetIf.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.NetIf.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.NetIf.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf("Unable to set sampleConfig.NetIf.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.NetIf.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.NetIf.Separator.Left.Color == "" {
@@ -1485,6 +1716,30 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 
 	if sampleConfig.CmdRun.FontSize == "" {
 		sampleConfig.CmdRun.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.CmdRun.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.CmdRun.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.CmdRun.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.CmdRun.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.CmdRun.FontSize = sampleConfig.FontSize
+		}
 	}
 
 	if sampleConfig.CmdRun.Separator.Left.Color == "" {
@@ -1576,6 +1831,45 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 	}
 
 	// sampleConfig.AppButtons.Enabled will false if not set in config
+	if sampleConfig.AppButtons.Color == "" {
+		sampleConfig.AppButtons.Color = sampleConfig.Color
+	}
+
+	if sampleConfig.AppButtons.Background == "" {
+		sampleConfig.AppButtons.Background = sampleConfig.Background
+	}
+
+	if sampleConfig.AppButtons.Font == "" {
+		sampleConfig.AppButtons.Font = sampleConfig.Font
+	}
+
+	if sampleConfig.AppButtons.FontSize == "" {
+		sampleConfig.AppButtons.FontSize = sampleConfig.FontSize
+	} else {
+		matched, err := regexp.MatchString(
+			`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+			sampleConfig.AppButtons.FontSize,
+		)
+
+		if err != nil {
+			log.Printf(
+				"Unable to set sampleConfig.AppButtons.FontSize: %s, fallback to %s",
+				err,
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.AppButtons.FontSize = sampleConfig.FontSize
+		}
+
+		if !matched {
+			log.Printf(
+				"Unable to set sampleConfig.AppButtons.FontSize, fallback to %s",
+				sampleConfig.FontSize,
+			)
+
+			sampleConfig.AppButtons.FontSize = sampleConfig.FontSize
+		}
+	}
 
 	if sampleConfig.AppButtons.Separator.Left.Color == "" {
 		sampleConfig.AppButtons.Separator.Left.Color = sampleConfig.Separator.Left.Color
@@ -1671,34 +1965,68 @@ func ReadConf(defaultConfig []byte) (*MyConfig, error) {
 			// app.Instance can be missing.
 			// app.Class can be missing.
 			if app.Name == "" {
-				app.Name = fmt.Sprintf("app%d", num)
+				sampleConfig.Apps[num].Name = fmt.Sprintf("app%d", num)
 			}
 
 			// app.Args can be empty slice. In that case command will be run without aruments.
 			if app.Cmd == "" {
-				app.Cmd = "true"
+				// If command omitted it will be just /usr/bin/true.
+				sampleConfig.Apps[num].Cmd = "true"
 			}
 
 			if app.Color == "" {
-				app.Color = sampleConfig.Color
+				sampleConfig.Apps[num].Color = sampleConfig.AppButtons.Color
 			}
 
 			if app.Background == "" {
-				app.Background = sampleConfig.Background
+				sampleConfig.Apps[num].Background = sampleConfig.AppButtons.Background
+			}
+
+			if app.Font == "" {
+				sampleConfig.Apps[num].Font = sampleConfig.AppButtons.Font
+			}
+
+			if app.FontSize == "" {
+				sampleConfig.Apps[num].FontSize = sampleConfig.AppButtons.FontSize
+			} else {
+				matched, err := regexp.MatchString(
+					`^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger)$`,
+					app.FontSize,
+				)
+
+				if err != nil {
+					log.Printf(
+						"Unable to set %s.FontSize: %s, fallback to %s",
+						app.Name,
+						err,
+						sampleConfig.AppButtons.FontSize,
+					)
+
+					sampleConfig.Apps[num].FontSize = sampleConfig.AppButtons.FontSize
+				}
+
+				if !matched {
+					log.Printf("Unable to set %s.FontSize, fallback to %s",
+						app.Name,
+						sampleConfig.AppButtons.FontSize,
+					)
+
+					sampleConfig.Apps[num].FontSize = sampleConfig.AppButtons.FontSize
+				}
 			}
 
 			if app.Border == "" {
-				app.Border = sampleConfig.Color
+				sampleConfig.Apps[num].Border = sampleConfig.AppButtons.Color
 			}
 
 			if app.BorderActive == "" {
-				app.BorderActive = sampleConfig.Color
+				sampleConfig.Apps[num].BorderActive = sampleConfig.AppButtons.Color
 			}
 
 			// app.Separator can be omitted, in that case it is false
 			// app.SeparatorBlockWidth can be missing
 			if app.FullText == "" {
-				app.FullText = fmt.Sprintf(" %d ", num)
+				sampleConfig.Apps[num].FullText = fmt.Sprintf(" %d ", num)
 			}
 		}
 	}