From: Tommie Gannert <tommie@gannert.se>
Date: Mon, 1 Aug 2016 00:27:44 +0000 (+0100)
Subject: Refactor common seconds_remaining code in print_battery_info.
X-Git-Tag: 2.11~28^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F144%2Fhead;p=i3%2Fi3status

Refactor common seconds_remaining code in print_battery_info.
---

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index d0e69c4..fc75f52 100644
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -28,6 +28,20 @@
 #include <sys/envsys.h>
 #endif
 
+/*
+ * Estimate the number of seconds remaining in state 'status'.
+ *
+ * Assumes a constant (dis)charge rate.
+ */
+static int seconds_remaining_from_rate(charging_status_t status, float full_design, float remaining, float present_rate) {
+    if (status == CS_CHARGING)
+        return 3600.0 * (full_design - remaining) / present_rate;
+    else if (status == CS_DISCHARGING)
+        return 3600.0 * remaining / present_rate;
+    else
+        return 0;
+}
+
 /*
  * Get battery information from /sys. Note that it uses the design capacity to
  * calculate the percentage, not the last full capacity, so you can see how
@@ -135,15 +149,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
     }
 
     if (present_rate > 0 && status != CS_FULL) {
-        float remaining_time;
-        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_remaining = (int)(remaining_time * 3600.0);
+        seconds_remaining = seconds_remaining_from_rate(status, full_design, remaining, present_rate);
     }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     int state;
@@ -397,16 +403,7 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
      * The envsys(4) ACPI routines do not appear to provide a 'time
      * remaining' figure, so we must deduce it.
      */
-    float remaining_time;
-
-    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_remaining = (int)(remaining_time * 3600.0);
+    seconds_remaining = seconds_remaining_from_rate(status, full_design, remaining, present_rate);
 #endif
 
     bool colorful_output = false;