Merge pull request #117 from yuki-was-taken/battery

Add Battery Stat

README.md

@@ -38,6 +38,7 @@ I created `Catnap🌿` (originally known as `Catnip`) as a playful, simple syste
     <li>shell</li>
     <li>terminal</li>
     <li>memory</li>
+    <li>battery</li>
     <li>disk space</li>
     <li>cpu info</li>
     <li>packages</li>

config/config.toml

@@ -16,11 +16,12 @@ kernel    = {icon = " ", name = "kernel", color = "(MA)"}
 desktop   = {icon = " ", name = "desktop", color = "(CN)"}
 # terminal  = {icon = " ", name = "term", color = "(RD)"}
 # shell     = {icon = " ", name = "shell", color = "(MA)"}
-packages  = {icon = " ", name = "packages", color = "(GN)"}  # WARNING: Resource Intensive
+# packages  = {icon = " ", name = "packages", color = "(RD)"}  # WARNING: Resource Intensive
 # gpu       = {icon = "󱔐 ", name = "gpu", color = "(MA)"}      # WARNING: Resource Intensive
 # cpu       = {icon = " ", name = "cpu", color = "(RD)"}
 disk_0    = {icon = " ", name = "disk", color = "(GN)"}
 memory    = {icon = " ", name = "memory", color = "(YW)"}
+# battery    = {icon = " ", name = "battery", color = "(GN)"}
 # weather   = {icon = " ", name = "weather", color = "(BE)"} # Requires curl and an emoji font. | WARNING: Resource Intensive
 sep_color = "SEPARATOR"
 colors    = {icon = " ", name = "colors", color = "!DT!", symbol = ""}

src/catnaplib/global/definitions.nim

@@ -54,7 +54,7 @@ const
 
     # Stats
     STATNAMES*    = @["username", "hostname", "uptime", "distro",
-                    "kernel", "desktop", "shell", "memory", "terminal",
+                    "kernel", "desktop", "shell", "memory", "battery", "terminal",
                     "cpu", "gpu", "packages", "weather", "colors"]
     STATKEYS*     = @["icon", "name", "color"]
 

src/catnaplib/platform/fetch.nim

@@ -19,6 +19,7 @@ proc fetchSystemInfo*(config: Config, distroId: string = "nil"): FetchInfo =
     result.list["terminal"] = proc(): string = return probe.getTerminal()
     result.list["shell"]    = proc(): string = return probe.getShell()
     result.list["memory"]   = proc(): string = return probe.getMemory()
+    result.list["battery"]   = proc(): string = return probe.getBattery()
     result.list["cpu"]      = proc(): string = return probe.getCpu()
     result.list["gpu"]      = proc(): string = return probe.getGpu()
     result.list["packages"] = proc(): string = return probe.getPackages()

src/catnaplib/platform/probe.nim

@@ -6,6 +6,7 @@ import parsecfg
 import posix_utils
 import tables
 import osproc
+import re
 from unicode import toLower
 from "../global/definitions" import DistroId, PKGMANAGERS, PKGCOUNTCOMMANDS, toTmpPath
 import "../terminal/logging"
@@ -121,6 +122,26 @@ proc getMemory*(mb: bool = true): string =
 
     result = &"{memUsedInt} / {memTotalInt} {suffix} ({percentage}%)"
 
+proc getBattery*(): string =
+    # Credits to https://gitlab.com/prashere/battinfo for regex implementation.
+    var batteryPath = ""
+
+    let 
+        BATTERY_REGEX = re"^BAT\d+$"
+        powerPath = "/sys/class/power_supply/"
+
+    for dir in os.walk_dir(powerPath):
+      if re.match(os.last_path_part(dir.path), BATTERY_REGEX):
+        batteryPath = dir.path & "/"
+      else:
+        logError("No battery detected!")
+
+    let
+        batteryCapacity = readFile(batteryPath & "capacity").strip()
+        batteryStatus = readFile(batteryPath & "status").strip()
+
+    result = &"{batteryCapacity}% ({batteryStatus})"
+
 proc getMounts*(): seq[string] =
     proc getMountPoints(): cstring {.importc, varargs, header: "getDisk.h".}
 
@@ -242,5 +263,4 @@ proc getWeather*(): string =
         logError("Failed to fetch weather!")
 
     # Returns the weather and discards the annoying newline.
-    let weather = readFile(tmpFile)
-    result = $weather.replace("\n", "")
+    result = readFile(tmpFile).strip()