Looks like we do not need separators for buttons

cmd/battery-test/main.go

@@ -21,3 +21,5 @@ func main() {
 		time.Sleep(1 * time.Second)
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

cmd/i3status-go/main.go

@@ -44,7 +44,6 @@ func main() {
 	// Conf.Values.PA
 	Conf.Values.SoundVolume = "🔊:0%"
 
-	// TODO: Проставить дефолтные значения для глобальных переменных модулей.
 	Conf.Values.BatteryString = "<span color='" + Conf.Battery.Color +
 		"' background='" + Conf.Battery.Background +
 		"' font='" + Conf.Battery.SymbolFont +
@@ -179,24 +178,11 @@ func main() {
 		// TODO: впилить для первого и последнего батона separator
 		if Conf.AppButtons.Enabled {
 			for _, app := range Conf.Apps {
-				var (
-					b  lib.I3BarOutBlock
-					sb strings.Builder
-				)
+				var b lib.I3BarOutBlock
 
-				sb.WriteString("<span color='")
-				sb.WriteString(app.Color)
-				sb.WriteString("' background='")
-				sb.WriteString(app.Background)
-				sb.WriteString("' font='")
-				sb.WriteString(app.Font)
-				sb.WriteString("' size='")
-				sb.WriteString(app.FontSize)
-				sb.WriteString("'>")
-				sb.WriteString(app.FullText)
-				sb.WriteString("</span>")
-
-				b.FullText = sb.String()
+				b.FullText = app.FullText
+				b.Background = app.Background
+				b.Color = app.Color
 				b.Instance = app.Instance
 				b.Markup = `pango`
 				b.Separator = app.Separator
@@ -680,3 +666,5 @@ func PrintToI3bar(c *lib.MyConfig) {
 		fmt.Println(strings.TrimSuffix(buf.String(), "\n") + ",")
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/batteries.go

@@ -57,11 +57,12 @@ func (c *MyConfig) UpdateBatteryInfo() {
 						continue
 					}
 
-					myCharge = strings.Trim(string(b), "\n")
+					myCharge = strings.TrimSpace(string(b))
 
 					statusFile := filepath.Dir(file) + "/status"
 
-					// If file exists.
+					_, err = os.Stat(statusFile)
+
 					if !os.IsNotExist(err) {
 						b, err := os.ReadFile(statusFile)
 
@@ -71,7 +72,7 @@ func (c *MyConfig) UpdateBatteryInfo() {
 							continue
 						}
 
-						myStatus = strings.Trim(string(b), "\n")
+						myStatus = strings.TrimSpace(string(b))
 					} else {
 						continue
 					}
@@ -104,9 +105,13 @@ func (c *MyConfig) UpdateBatteryInfo() {
 				}
 			}
 		} else {
-			// In theory, this module should give for each entry its separate err, but in practice it gives
-			// one single err for all entries, so we cannot detemine whist exatly entry errored.
-			batteries, _ = battery.GetAll()
+			var err error
+
+			batteries, err = battery.GetAll()
+
+			if err != nil {
+				log.Printf("Unable to get battery info: %s", err)
+			}
 		}
 
 		var (
@@ -254,3 +259,5 @@ func (c *MyConfig) UpdateBatteryInfo() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/clock.go

@@ -35,3 +35,5 @@ func (c *MyConfig) UpdateClock() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/collection.go

@@ -4,24 +4,19 @@ import (
 	"sync"
 )
 
-type (
-	// Collection is sync.Map, that stores arbitrary data.
-	Collection struct {
-		close chan struct{}
-		items sync.Map
-	}
+// Collection is sync.Map, that stores arbitrary data.
+type Collection struct {
+	items sync.Map
+}
 
-	// Item just interface for stoing any data.
-	item struct {
-		data any
-	}
-)
+// Item just interface for stoing any data.
+type item struct {
+	data any
+}
 
 // NewCollection creates new instance of "collection".
 func NewCollection() *Collection {
-	c := &Collection{ //nolint:exhaustruct
-		close: make(chan struct{}),
-	}
+	c := &Collection{}
 
 	return c
 }
@@ -34,9 +29,12 @@ func (collection *Collection) Get(key any) (any, bool) {
 		return nil, false
 	}
 
-	item := obj.(item)
+	it, ok := obj.(item)
+	if !ok {
+		return nil, false
+	}
 
-	return item.data, true
+	return it.data, true
 }
 
 // Set saves value to given "collection".
@@ -49,9 +47,12 @@ func (collection *Collection) Set(key any, value any) {
 // Range apply function f to all keys/values in collection. Returns immediately on first error.
 func (collection *Collection) Range(f func(key, value any) bool) {
 	fn := func(key, value any) bool {
-		item := value.(item)
+		it, ok := value.(item)
+		if !ok {
+			return true
+		}
 
-		return f(key, item.data)
+		return f(key, it.data)
 	}
 
 	collection.items.Range(fn)
@@ -64,8 +65,6 @@ func (collection *Collection) Delete(key any) {
 
 // Close frees memory occupied by collection and deletes collection itself.
 func (collection *Collection) Close() {
-	collection.close <- struct{}{}
-
 	collection.items = sync.Map{}
 }
 

internal/lib/config.go

@@ -2063,3 +2063,5 @@ func LocateConfFile() (string, error) {
 
 	return filepath.Dir(i3ConfigPath) + "/i3status-go.json", nil
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/cputemp.go

@@ -23,6 +23,7 @@ func (c *MyConfig) UpdateCPUTemperature() {
 			temperature = make([]int64, n)
 			tSum        int64
 			tAvg        int64
+			validCount  int
 		)
 
 		if Delay == InitialDelay {
@@ -35,48 +36,50 @@ func (c *MyConfig) UpdateCPUTemperature() {
 
 			if err != nil {
 				log.Printf("Unable to open %s: %s", filename, err)
-			} else {
-				reader := bufio.NewReader(file)
-				line, _, err := reader.ReadLine()
-
-				if err != nil {
-					log.Printf("Unable to read from %s: %s", filename, err)
-
-					err = file.Close()
-
-					if err != nil {
-						log.Printf("Unable to close %s: %s", filename, err)
-					}
-				} else {
-					err = file.Close()
-
-					if err != nil {
-						log.Printf("Unable to close %s: %s", filename, err)
-					} else {
-						temp, err := strconv.ParseInt(string(line), 10, 32)
-
-						if err != nil {
-							log.Printf("Unable to convert string to number from file %s: %s", filename, err)
-						} else {
-							if temp > 1000 {
-								temp /= 1000
-							}
-
-							temperature[i] = temp
-						}
-					}
-				}
+				continue
 			}
+			defer file.Close()
+
+			reader := bufio.NewReader(file)
+			line, _, err := reader.ReadLine()
+
+			if err != nil {
+				log.Printf("Unable to read from %s: %s", filename, err)
+				continue
+			}
+
+			temp, err := strconv.ParseInt(string(line), 10, 32)
+
+			if err != nil {
+				log.Printf("Unable to convert string to number from file %s: %s", filename, err)
+				continue
+			}
+
+			if temp > 1000 {
+				temp /= 1000
+			}
+
+			temperature[i] = temp
+			validCount++
 		}
 
-		if len(temperature) == 1 {
-			tAvg = temperature[0]
+		if validCount == 0 {
+			continue
+		}
+
+		if validCount == 1 {
+			for _, t := range temperature {
+				if t != 0 {
+					tAvg = t
+					break
+				}
+			}
 		} else {
 			for _, t := range temperature {
 				tSum += t
 			}
 
-			tAvg = tSum / int64(len(temperature))
+			tAvg = tSum / int64(validCount)
 		}
 
 		if c.Values.CPUTemperature != tAvg {
@@ -85,3 +88,5 @@ func (c *MyConfig) UpdateCPUTemperature() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/cron.go

@@ -27,14 +27,11 @@ func (c MyConfig) RunCron() {
 		_, err := myCron.NewJob(
 			gocron.CronJob(job.Time, false),
 			gocron.NewTask(
-				// Сука, просто заспавнить бинарь, ну почему это надо делать через жопу-то?
-				any(
-					func() bool {
-						c.Channels.RunChan <- job.Cmd
+				func() bool {
+					c.Channels.RunChan <- job.Cmd
 
-						return true
-					},
-				),
+					return true
+				},
 			),
 		)
 
@@ -45,3 +42,5 @@ func (c MyConfig) RunCron() {
 
 	myCron.Start()
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/i3.go

@@ -19,15 +19,18 @@ var WL WinList
 
 // UpdateI3WinList subsribes to all window-related events and send them to I3EventParser() for more detailed parsing.
 func (c *MyConfig) UpdateI3WinList() {
-	// TODO: Здесь получить начальный список окон, управляемых i3wm (через GetTree()) и сложить их атрибутику в переменную WL
 	Tree, err := i3.GetTree()
 
 	if err != nil {
 		log.Printf("Unable to get list of windows: %s", err)
+
+		return
 	}
 
 	c.ExtractProps(Tree.Root)
 
+	c.Channels.UpdateReady <- true
+
 	i3wm := i3.Subscribe(i3.WindowEventType)
 
 	for i3wm.Next() {
@@ -106,8 +109,10 @@ func (c *MyConfig) I3EventParser(e *i3.WindowEvent) {
 // interfaceToUint превращает данный интерфейс в Uint64.
 // Если может, конечно :) .
 func interfaceToUint64(iface any) uint64 {
-	// А теперь мы начинаем дурдом, нам надо превратить ёбанный any в []string.
-	// Поскольку any может быть чем угодно, перестрахуемся.
+	if iface == nil {
+		return 0
+	}
+
 	if reflect.TypeOf(iface).Kind() == reflect.Uint64 {
 		return reflect.ValueOf(iface).Uint()
 	}
@@ -152,18 +157,16 @@ func HasWindows(className string, instanceName string) bool {
 func FindWindowInstance(regexpStr string) bool {
 	var found = false
 
+	re, err := regexp.Compile(regexpStr)
+	if err != nil {
+		log.Printf("Unable to perform regexp match: %s", err)
+
+		return false
+	}
+
 	f := func(key any, value any) bool { //nolint: revive
 		keyStr := reflect.ValueOf(key).String()
 
-		re, err := regexp.Compile(regexpStr) // we do not want shit our pants and panic on
-		//        erroneous regexp, we want log it to stderr, that it.
-
-		if err != nil {
-			log.Printf("Unable to perform regexp match: %s", err)
-
-			return true
-		}
-
 		if re.Match([]byte(keyStr)) { //nolint:mirror
 			found = true
 
@@ -183,18 +186,16 @@ func FindWindowInstance(regexpStr string) bool {
 func FindWindowClass(regexpStr string) bool {
 	var found = false
 
+	re, err := regexp.Compile(regexpStr)
+	if err != nil {
+		log.Printf("Unable to perform regexp match: %s", err)
+
+		return false
+	}
+
 	f := func(key any, value any) bool { //nolint: revive
 		keyStr := reflect.ValueOf(key).String()
 
-		re, err := regexp.Compile(regexpStr) // we do not want shit our pants and panic on
-		//        erroneous regexp, we want log it to stderr, that it.
-
-		if err != nil {
-			log.Printf("Unable to perform regexp match: %s", err)
-
-			return true
-		}
-
 		if re.Match([]byte(keyStr)) { //nolint:mirror
 			found = true
 
@@ -225,3 +226,5 @@ func (c *MyConfig) ExtractProps(n *i3.Node) {
 		c.ExtractProps(node)
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/ifmon.go

@@ -44,8 +44,8 @@ func (c *MyConfig) UpdateIfStatus() {
 			} else {
 				switch strings.TrimSpace(string(operstate)) {
 				case "up":
-					StatusStr := fmt.Sprintf("<span foreground=\"%s\">⍋</span>", c.NetIf.UpColor)
-					operstate = []byte(StatusStr)
+					statusStr := fmt.Sprintf("<span foreground=\"%s\">⍋</span>", c.NetIf.UpColor)
+					operstate = []byte(statusStr)
 				case "down":
 					statusStr := fmt.Sprintf("<span foreground=\"%s\">⍒</span>", c.NetIf.DownColor)
 					operstate = []byte(statusStr)
@@ -67,3 +67,5 @@ func (c *MyConfig) UpdateIfStatus() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/la.go

@@ -2,6 +2,7 @@ package lib
 
 import (
 	"fmt"
+	"log"
 	"time"
 
 	"github.com/shirou/gopsutil/load"
@@ -22,7 +23,13 @@ func (c *MyConfig) UpdateLaStats() {
 			ticker.Reset(Delay)
 		}
 
-		l, _ := load.Avg()
+		l, err := load.Avg()
+
+		if err != nil {
+			log.Printf("Unable to get LA stats: %s", err)
+
+			continue
+		}
 
 		lav := fmt.Sprintf("%.2f", l.Load1)
 
@@ -32,3 +39,5 @@ func (c *MyConfig) UpdateLaStats() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/memory.go

@@ -38,17 +38,17 @@ func (c *MyConfig) UpdateMemStats() {
 			continue
 		}
 
-		sw, err := mem.SwapMemory()
-
-		if err != nil {
-			log.Printf("Unable to get swap statistics: %s", err)
-			time.Sleep(1 * time.Second)
-
-			continue
-		}
-
 		if c.Mem.ShowSwap {
-			if c.Values.Memory.Usedpct != uint64(v.UsedPercent) || c.Values.Memory.Shared != v.Shared/1024/1024 || c.Values.Memory.Swap != v.SwapTotal-v.SwapFree {
+			sw, err := mem.SwapMemory()
+
+			if err != nil {
+				log.Printf("Unable to get swap statistics: %s", err)
+				time.Sleep(1 * time.Second)
+
+				continue
+			}
+
+			if c.Values.Memory.Usedpct != uint64(v.UsedPercent) || c.Values.Memory.Shared != v.Shared/1024/1024 || c.Values.Memory.Swap != sw.Used/1024/1024 {
 				c.Values.Memory.Usedpct = uint64(v.UsedPercent)
 				c.Values.Memory.Shared = v.Shared / 1024 / 1024
 				c.Values.Memory.Swap = sw.Used / 1024 / 1024
@@ -63,3 +63,5 @@ func (c *MyConfig) UpdateMemStats() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/pulseaudio.go

@@ -222,3 +222,5 @@ func (c *MyConfig) SVPAHandler() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/runcommand.go

@@ -31,7 +31,7 @@ func (c *MyConfig) RunCommand() {
 
 		outputString += RunProcess(command)
 
-		log.Println(c.Values.RunCommandOutput)
+		log.Println(outputString)
 
 		if c.Values.RunCommandOutput != outputString {
 			c.Values.RunCommandOutput = outputString
@@ -39,3 +39,5 @@ func (c *MyConfig) RunCommand() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/signal.go

@@ -6,8 +6,6 @@ import (
 	"syscall"
 )
 
-var PrintOutput = true
-
 // SigHandler OS signal handler.
 func (c *MyConfig) SigHandler() {
 	for s := range c.Channels.SigChan {
@@ -33,3 +31,5 @@ func (c *MyConfig) SigHandler() {
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/spawn.go

@@ -13,10 +13,21 @@ import (
 // Spawner forks and execs given program, and also detaches form its control tty.
 func (c *MyConfig) Spawner() {
 	for prg := range c.Channels.RunChan {
-		<-time.After(25 * time.Millisecond)
+		time.Sleep(25 * time.Millisecond)
 
-		devnullR, _ := os.Open(os.DevNull)
-		devnullW, _ := os.OpenFile(os.DevNull, os.O_WRONLY|os.O_APPEND, 0644)
+		devnullR, err := os.Open(os.DevNull)
+		if err != nil {
+			log.Printf("Unable to open /dev/null for reading: %s", err)
+			continue
+		}
+		defer devnullR.Close()
+
+		devnullW, err := os.OpenFile(os.DevNull, os.O_WRONLY|os.O_APPEND, 0644)
+		if err != nil {
+			log.Printf("Unable to open /dev/null for writing: %s", err)
+			continue
+		}
+		defer devnullW.Close()
 
 		spa := syscall.SysProcAttr{
 			Setsid:     true,
@@ -34,6 +45,7 @@ func (c *MyConfig) Spawner() {
 
 		if err != nil {
 			log.Printf("Unable to spawn %s: %s", prg[0], err)
+			continue
 		}
 
 		_, err = syscall.ForkExec(bin, prg, &pa)
@@ -41,10 +53,6 @@ func (c *MyConfig) Spawner() {
 		if err != nil {
 			log.Printf("Unable to spawn %s: %s", prg[0], err)
 		}
-
-		// Close file errors we don't handle :) at all.
-		_ = devnullR.Close()
-		_ = devnullW.Close()
 	}
 }
 
@@ -53,7 +61,11 @@ func (c *MyConfig) CleanZombies() {
 	r := syscall.Rusage{}
 
 	for {
-		_, _ = syscall.Wait4(-1, nil, 0, &r)
+		pid, _ := syscall.Wait4(-1, nil, syscall.WNOHANG, &r)
+
+		if pid > 0 {
+			continue
+		}
 
 		time.Sleep(1 * time.Minute)
 	}
@@ -96,3 +108,5 @@ func RunProcess(command []string) string {
 
 	return strings.TrimRight(stdout.String(), "\n")
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/stdin.go

@@ -51,17 +51,11 @@ func (c *MyConfig) ParseStdin() {
 			continue
 		}
 
-		for i := 0; i < len(buf); i++ {
-			if strings.HasPrefix(buf, "{") {
-				break
-			}
-
-			buf = buf[1:]
-		}
-
-		if len(buf) == 0 {
-			log.Print("String from stdin has zero length, skipping")
+		buf = strings.TrimLeftFunc(buf, func(r rune) bool {
+			return r != '{'
+		})
 
+		if !strings.HasPrefix(buf, "{") {
 			continue
 		}
 
@@ -123,12 +117,17 @@ func (c *MyConfig) ParseStdin() {
 
 				c.Channels.RunChan <- prg
 
+				break
 			case app.Instance != "" && e.Instance == app.Instance:
 				prg := append([]string{}, app.Cmd)
 				prg = append(prg, app.Args...)
 
 				c.Channels.RunChan <- prg
+
+				break
 			}
 		}
 	}
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */

internal/lib/vpn.go

@@ -112,3 +112,5 @@ func (c *MyConfig) VPNFileCheck() bool {
 
 	return true
 }
+
+/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */