bumped to v0.1.2

simonmittag · Jun 25, 2022 · deb7f17 · deb7f17
1 parent 8b47206
commit deb7f17
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/l0la.go b/l0la.go
@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-const Version = "v0.1.1"
+const Version = "v0.1.2"
 
 func Watch(pid int) {
 	lines := make([]io.Writer, 0)
@@ -25,22 +25,27 @@ func Watch(pid int) {
 	pad := 26
 	s := NewSpinnerAnim()
 
-	for {
-		fmt.Fprint(lines[0], Logo()+"\n")
-		fmt.Fprintf(lines[0], "%s watching pid: %v %s \n", s.Next(), pid, Pidgrepstatus(pid))
-		fmt.Fprintf(lines[0], "┏━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n")
-		fmt.Fprintf(lines[0], "┃ TCP conns   ┃ %s ┃\n", Red(LPad(pad, FGroup(Conngrep(pid)))))
-		fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-		fmt.Fprintf(lines[0], "┃ Open files  ┃ %s ┃\n", Yellow(LPad(pad, FGroup(Filegrep(pid)))))
-		fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-		fmt.Fprintf(lines[0], "┃ Threads     ┃ %s ┃\n", Blue(LPad(pad, FGroup(Threadgrep(pid)))))
-		fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-		fmt.Fprintf(lines[0], "┃ RSS bytes   ┃ %s ┃\n", Gray(8, LPad(pad, FGroup(Memgrep(pid)))))
-		fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
-		fmt.Fprintf(lines[0], "┃ CPU percent ┃ %s ┃\n", Magenta(LPad(pad, Cpugrep(pid))))
-		fmt.Fprintf(lines[0], "┗━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\n")
-		l0.Flush()
-		time.Sleep(time.Millisecond * 500)
+	if PidgrepActive(pid) {
+		for {
+			fmt.Fprint(lines[0], Logo()+"\n")
+			fmt.Fprintf(lines[0], "%s watching pid: %v %s \n", s.Next(), pid, Pidgrepstatus(pid))
+			fmt.Fprintf(lines[0], "┏━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n")
+			fmt.Fprintf(lines[0], "┃ TCP conns   ┃ %s ┃\n", Red(LPad(pad, FGroup(Conngrep(pid)))))
+			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+			fmt.Fprintf(lines[0], "┃ Open files  ┃ %s ┃\n", Yellow(LPad(pad, FGroup(Filegrep(pid)))))
+			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+			fmt.Fprintf(lines[0], "┃ Threads     ┃ %s ┃\n", Blue(LPad(pad, FGroup(Threadgrep(pid)))))
+			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+			fmt.Fprintf(lines[0], "┃ RSS bytes   ┃ %s ┃\n", Gray(8, LPad(pad, FGroup(Memgrep(pid)))))
+			fmt.Fprintf(lines[0], "┣━━━━━━━━━━━━━╋━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫\n")
+			fmt.Fprintf(lines[0], "┃ CPU percent ┃ %s ┃\n", Magenta(LPad(pad, Cpugrep(pid))))
+			fmt.Fprintf(lines[0], "┗━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\n")
+			l0.Flush()
+			time.Sleep(time.Millisecond * 500)
+		}
+	} else {
+		fmt.Printf(Logo())
+		fmt.Printf("\n%d not a pid, insufficient privileges or dead?\n", pid)
 	}
 }
 

diff --git a/pidgrep.go b/pidgrep.go
@@ -8,15 +8,15 @@ import (
 
 const pidgrepcmd = "ps -p %d | grep -v PID | wc -l"
 
-func Pidgrep(pid int) bool {
+func PidgrepActive(pid int) bool {
 	cmd := fmt.Sprintf(pidgrepcmd, pid)
 	stdout, _, _ := Shellout(cmd)
 	r, _ := strconv.Atoi(strings.TrimSpace(stdout))
 	return r == 1
 }
 
 func Pidgrepstatus(pid int) string {
-	if Pidgrep(pid) {
+	if PidgrepActive(pid) {
 		return "[ACTIVE]"
 	} else {
 		return "[DEAD?]"