From 68d38a61d7ce0a854c604a698f917a3b80b2c9b4 Mon Sep 17 00:00:00 2001
From: Matthias Gamsjager <matthias.gamsjager@philips.com>
Date: Tue, 14 May 2019 11:08:46 +0200
Subject: [PATCH 1/2] Create separate file for FreeBSD

---
 src/widgets/proc_freebsd.go | 66 +++++++++++++++++++++++++++++++++++++
 src/widgets/proc_other.go   |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/widgets/proc_freebsd.go

diff --git a/src/widgets/proc_freebsd.go b/src/widgets/proc_freebsd.go
new file mode 100644
index 0000000..0122496
--- /dev/null
+++ b/src/widgets/proc_freebsd.go
@@ -0,0 +1,66 @@
+// +build freebsd
+
+package widgets
+
+import (
+	"encoding/json"
+	"fmt"
+	"log"
+	"os/exec"
+	"strconv"
+	"strings"
+)
+
+type Keywords struct {
+	ProcessInformation struct {
+		Process []struct {
+			Pid  string `json: pid`
+			Comm string `json: command`
+			Cpu  string `json: percent-cpu`
+			Mem  string `json: percent-memory`
+			Args string `json: arguments`
+		} `json: process`
+	} `json: process-information`
+}
+
+func getProcs() ([]Proc, error) {
+	output, err := exec.Command("ps", "-axo pid,comm,%cpu,%mem,args", "--libxo", "json").Output()
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute 'ps' command: %v", err)
+	}
+
+	processList := Keywords{}
+	err = json.Unmarshal(output, &processList)
+	if err != nil {
+		return nil, fmt.Errorf("failed to unmarshal json. %s", err)
+	} else {
+		return nil, fmt.Errorf("Success to unmarshal json. %s", output)
+	}
+
+	procs := []Proc{}
+
+	for _, process := range processList.ProcessInformation.Process {
+		pid, err := strconv.Atoi(strings.TrimSpace(process.Pid))
+		if err != nil {
+			log.Printf("failed to convert first field to int: %v. split: %v", err, process)
+		}
+		cpu, err := strconv.ParseFloat(process.Cpu, 64)
+		if err != nil {
+			log.Printf("failed to convert third field to float: %v. split: %v", err, process)
+		}
+		mem, err := strconv.ParseFloat(process.Mem, 64)
+		if err != nil {
+			log.Printf("failed to convert fourth field to float: %v. split: %v", err, process)
+		}
+		proc := Proc{
+			Pid:         pid,
+			CommandName: process.Comm,
+			Cpu:         cpu,
+			Mem:         mem,
+			FullCommand: process.Args,
+		}
+		procs = append(procs, proc)
+	}
+
+	return procs, nil
+}
diff --git a/src/widgets/proc_other.go b/src/widgets/proc_other.go
index 73e12a2..a4aedf0 100644
--- a/src/widgets/proc_other.go
+++ b/src/widgets/proc_other.go
@@ -1,4 +1,4 @@
-// +build freebsd darwin openbsd
+// +build darwin openbsd
 
 package widgets
 

From ea5e097d52c5d1ffa832248e0eb04f6aa649164e Mon Sep 17 00:00:00 2001
From: Matthias Gamsjager <matthias.gamsjager@philips.com>
Date: Tue, 14 May 2019 12:43:39 +0200
Subject: [PATCH 2/2] Proper json helper

---
 src/widgets/proc_freebsd.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/widgets/proc_freebsd.go b/src/widgets/proc_freebsd.go
index 0122496..96c8833 100644
--- a/src/widgets/proc_freebsd.go
+++ b/src/widgets/proc_freebsd.go
@@ -11,16 +11,16 @@ import (
 	"strings"
 )
 
-type Keywords struct {
+type processList struct {
 	ProcessInformation struct {
 		Process []struct {
-			Pid  string `json: pid`
-			Comm string `json: command`
-			Cpu  string `json: percent-cpu`
-			Mem  string `json: percent-memory`
-			Args string `json: arguments`
-		} `json: process`
-	} `json: process-information`
+			Pid  string `json:"pid"`
+			Comm string `json:"command"`
+			Cpu  string `json:"percent-cpu" `
+			Mem  string `json:"percent-memory" `
+			Args string `json:"arguments" `
+		} `json:"process"`
+	} `json:"process-information"`
 }
 
 func getProcs() ([]Proc, error) {
@@ -29,17 +29,17 @@ func getProcs() ([]Proc, error) {
 		return nil, fmt.Errorf("failed to execute 'ps' command: %v", err)
 	}
 
-	processList := Keywords{}
-	err = json.Unmarshal(output, &processList)
+	list := processList{}
+	err = json.Unmarshal(output, &list)
 	if err != nil {
 		return nil, fmt.Errorf("failed to unmarshal json. %s", err)
-	} else {
-		return nil, fmt.Errorf("Success to unmarshal json. %s", output)
 	}
-
 	procs := []Proc{}
 
-	for _, process := range processList.ProcessInformation.Process {
+	for _, process := range list.ProcessInformation.Process {
+		if process.Comm == "idle" {
+			continue
+		}
 		pid, err := strconv.Atoi(strings.TrimSpace(process.Pid))
 		if err != nil {
 			log.Printf("failed to convert first field to int: %v. split: %v", err, process)