added batmon usage for battery output

This commit is contained in:
Paul Wilde 2025-01-27 14:14:34 +00:00
parent 2cff444a6b
commit 2df81dc670
2 changed files with 5 additions and 16 deletions

View file

@ -1,6 +1,5 @@
import strutils import strutils
import osproc import ../../../batmon/src/batmon
import jsony
import ../common import ../common
import ../common/colours import ../common/colours
@ -19,15 +18,6 @@ const alert_bg = yellow
const med_fg = green const med_fg = green
#const med_bg = black #const med_bg = black
type
Battery = object
charge: float
status: string
charging: bool
proc postHook(b: var Battery) =
b.charging = b.status == "Charging"
proc batteryExists(): bool = proc batteryExists(): bool =
try: try:
let state = strip(readFile("/sys/class/power_supply/" & battery & "/present")) let state = strip(readFile("/sys/class/power_supply/" & battery & "/present"))
@ -113,9 +103,7 @@ proc getBatteryInfo() =
proc getBatteryInfoBSD() = proc getBatteryInfoBSD() =
try: try:
let batmon = osproc.execCmdEx("batmon -o") let bat = get_battery_status()
if batmon.exitCode == 0:
let bat = batmon.output.fromJson(Battery)
let data = getOutput(bat.charge, bat.charging) let data = getOutput(bat.charge, bat.charging)
outputData(data) outputData(data)
except: except:

View file

@ -15,6 +15,7 @@ requires "parsetoml >= 0.7.1"
requires "argparse" requires "argparse"
requires "configparser" requires "configparser"
requires "jsony" requires "jsony"
requires "batmon"
task refresh_emoji, "Refresh Emoji Library file": task refresh_emoji, "Refresh Emoji Library file":
exec "nim c -r src/lib/refresh_emoji.nim" exec "nim c -r src/lib/refresh_emoji.nim"