Properly output JSON with libyajl

[i3/i3status] / src / print_battery_info.c

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index eb1f6bb2fb49f5aa9fff6cd51cc0a33640acc2d0..3892d359a187b7e1f1871bf184dcfbae3ef7e991 100644 (file)
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -1,7 +1,9 @@
 // vim:ts=8:expandtab
+#include <time.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <yajl/yajl_gen.h>
 
 #include "i3status.h"
 
@@ -16,19 +18,33 @@
  * worn off your battery is.
  *
  */
-void print_battery_info(int number, const char *format) {
+void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, bool last_full_capacity) {
+        time_t empty_time;
+        struct tm *empty_tm;
         char buf[1024];
-        char *walk, *last;
+        char statusbuf[16];
+        char percentagebuf[16];
+        char remainingbuf[256];
+        char emptytimebuf[256];
+        const char *walk, *last;
+        char *outwalk = buffer;
         int full_design = -1,
             remaining = -1,
             present_rate = -1;
         charging_status_t status = CS_DISCHARGING;
 
+        memset(statusbuf, '\0', sizeof(statusbuf));
+        memset(percentagebuf, '\0', sizeof(percentagebuf));
+        memset(remainingbuf, '\0', sizeof(remainingbuf));
+        memset(emptytimebuf, '\0', sizeof(emptytimebuf));
+
+        INSTANCE(path);
+
 #if defined(LINUX)
         static char batpath[512];
-        sprintf(batpath, "/sys/class/power_supply/BAT%d/uevent", number);
+        sprintf(batpath, path, number);
         if (!slurp(batpath, buf, sizeof(buf))) {
-                printf("No battery");
+                OUTPUT_FULL_TEXT("No battery");
                 return;
         }
 
@@ -46,23 +62,23 @@ void print_battery_info(int number, const char *format) {
                         remaining = atoi(walk+1);
                 else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW"))
                         present_rate = atoi(walk+1);
+                else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW"))
+                        present_rate = atoi(walk+1);
                 else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging"))
                         status = CS_CHARGING;
                 else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Full"))
                         status = CS_FULL;
                 else {
                         /* The only thing left is the full capacity */
-#if 0
-                        if (bat->use_last_full) {
+                        if (last_full_capacity) {
                                 if (!BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL") &&
                                     !BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL"))
                                         continue;
                         } else {
-#endif
                                 if (!BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN") &&
                                     !BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN"))
                                         continue;
-                        //}
+                        }
 
                         full_design = atoi(walk+1);
                 }
@@ -71,31 +87,38 @@ void print_battery_info(int number, const char *format) {
         if ((full_design == 1) || (remaining == -1))
                 return;
 
+        (void)snprintf(statusbuf, sizeof(statusbuf), "%s",
+                        (status == CS_CHARGING ? "CHR" :
+                         (status == CS_DISCHARGING ? "BAT" : "FULL")));
+
+        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.02f%%",
+                       (((float)remaining / (float)full_design) * 100));
+
         if (present_rate > 0) {
                 float remaining_time;
-                int seconds, hours, minutes;
+                int seconds, hours, minutes, seconds_remaining;
                 if (status == CS_CHARGING)
                         remaining_time = ((float)full_design - (float)remaining) / (float)present_rate;
                 else if (status == CS_DISCHARGING)
                         remaining_time = ((float)remaining / (float)present_rate);
                 else remaining_time = 0;
 
-                seconds = (int)(remaining_time * 3600.0);
-                hours = seconds / 3600;
-                seconds -= (hours * 3600);
+                seconds_remaining = (int)(remaining_time * 3600.0);
+
+                hours = seconds_remaining / 3600;
+                seconds = seconds_remaining - (hours * 3600);
                 minutes = seconds / 60;
                 seconds -= (minutes * 60);
 
-                (void)printf("%s %.02f%% %02d:%02d:%02d",
-                        (status == CS_CHARGING ? "CHR" :
-                         (status == CS_DISCHARGING ? "BAT" : "FULL")),
-                        (((float)remaining / (float)full_design) * 100),
+                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02d:%02d:%02d",
                         max(hours, 0), max(minutes, 0), max(seconds, 0));
-        } else {
-                (void)printf("%s %.02f%%",
-                        (status == CS_CHARGING ? "CHR" :
-                         (status == CS_DISCHARGING ? "BAT" : "FULL")),
-                        (((float)remaining / (float)full_design) * 100));
+
+                empty_time = time(NULL);
+                empty_time += seconds_remaining;
+                empty_tm = localtime(&empty_time);
+
+                (void)snprintf(emptytimebuf, sizeof(emptytimebuf), "%02d:%02d:%02d",
+                        max(empty_tm->tm_hour, 0), max(empty_tm->tm_min, 0), max(empty_tm->tm_sec, 0));
         }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
         int state;
@@ -129,21 +152,43 @@ void print_battery_info(int number, const char *format) {
 
         full_design = sysctl_rslt;
 
+        (void)snprintf(statusbuf, sizeof(statusbuf), "%s",
+                        (status == CS_CHARGING ? "CHR" :
+                         (status == CS_DISCHARGING ? "BAT" : "FULL")));
+
+        (void)snprintf(percentagebuf, sizeof(percentagebuf), "%02d%%",
+                       present_rate);
+
         if (state == 1) {
                 int hours, minutes;
                 minutes = remaining;
                 hours = minutes / 60;
                 minutes -= (hours * 60);
-                (void)printf("%s %02d%% %02dh%02d",
-                               (status == CS_CHARGING ? "CHR" :
-                                (status == CS_DISCHARGING ? "BAT" : "FULL")),
-                               present_rate,
+                (void)snprintf(remainingbuf, sizeof(remainingbuf), "%02dh%02d",
                                max(hours, 0), max(minutes, 0));
-        } else {
-                (void)printf("%s %02d%%",
-                               (status == CS_CHARGING ? "CHR" :
-                                (status == CS_DISCHARGING ? "BAT" : "FULL")),
-                               present_rate);
         }
 #endif
+
+        for (walk = format; *walk != '\0'; walk++) {
+                if (*walk != '%') {
+                        *(outwalk++) = *walk;
+                        continue;
+                }
+
+                if (strncmp(walk+1, "status", strlen("status")) == 0) {
+                        outwalk += sprintf(outwalk, "%s", statusbuf);
+                        walk += strlen("status");
+                } else if (strncmp(walk+1, "percentage", strlen("percentage")) == 0) {
+                        outwalk += sprintf(outwalk, "%s", percentagebuf);
+                        walk += strlen("percentage");
+                } else if (strncmp(walk+1, "remaining", strlen("remaining")) == 0) {
+                        outwalk += sprintf(outwalk, "%s", remainingbuf);
+                        walk += strlen("remaining");
+                } else if (strncmp(walk+1, "emptytime", strlen("emptytime")) == 0) {
+                        outwalk += sprintf(outwalk, "%s", emptytimebuf);
+                        walk += strlen("emptytime");
+                }
+        }
+
+        OUTPUT_FULL_TEXT(buffer);
 }