From 4dffbb0bb70189318ac03e44f398aa1fffac00ca Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Mon, 1 Mar 2021 19:53:20 +0100
Subject: [PATCH] battery rework

---
 src/fastfetch.h       |  1 +
 src/modules/battery.c | 80 ++++++++++++++++++++-----------------------
 src/util.c            |  7 ++--
 3 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/src/fastfetch.h b/src/fastfetch.h
index c2ba0643a..791a38893 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -59,6 +59,7 @@ typedef struct FFinstance
 void ffInitState(FFstate* state);
 void ffPrintKey(FFconfig* config, const char* key);
 void ffPrintLogoAndKey(FFinstance* instance, const char* key);
+void ffGetFileContent(const char* fileName, char* buffer, uint32_t bufferSize);
 void ffParsePropFile(const char* file, const char* regex, char* buffer);
 void ffParsePropFileHome(FFinstance* instance, const char* relativeFile, const char* regex, char* buffer);
 void ffPrintGtkPretty(const char* gtk2, const char* gtk3, const char* gtk4);
diff --git a/src/modules/battery.c b/src/modules/battery.c
index 2f87d7d5e..30c46b74f 100644
--- a/src/modules/battery.c
+++ b/src/modules/battery.c
@@ -7,55 +7,49 @@ void ffPrintBattery(FFinstance* instance)
         return;
     #endif // FASTFETCH_BUILD_FLASHFETCH
 
-    int scanned;
+    char model[256];
+    ffGetFileContent("/sys/class/power_supply/BAT0/model_name", model, sizeof(model));
+    
+    char technology[32];
+    ffGetFileContent("/sys/class/power_supply/BAT0/technology", technology, sizeof(technology));
 
-    FILE* fullFile = fopen("/sys/class/power_supply/BAT0/charge_full", "r");
-    if(fullFile == NULL)
-    {
-        ffPrintError(instance, "Battery", "fopen(\"/sys/class/power_supply/BAT0/charge_full\", \"r\") == NULL");
-        return;
-    }
-    uint32_t full;
-    scanned = fscanf(fullFile, "%u", &full);
-    if(scanned != 1)
-    {
-        ffPrintError(instance, "Battery", "fscanf(fullFile, \"%u\", &full) != 1");
-        return;
-    }
-    fclose(fullFile);
+    char capacity[32];
+    ffGetFileContent("/sys/class/power_supply/BAT0/capacity", capacity, sizeof(capacity));
 
-    FILE* nowFile = fopen("/sys/class/power_supply/BAT0/charge_now", "r");
-    if(nowFile == NULL)
-    {
-        ffPrintError(instance, "Battery", "fopen(\"/sys/class/power_supply/BAT0/charge_now\", \"r\") == NULL");
-        return;
-    }
-    uint32_t now;
-    scanned = fscanf(nowFile, "%u", &now);
-    if(scanned != 1)
-    {
-        ffPrintError(instance, "Battery", "fscanf(nowFile, \"%u\", &now) != 1");
-        return;
-    }
-    fclose(nowFile);
+    char status[32];
+    ffGetFileContent("/sys/class/power_supply/BAT0/status", status, sizeof(status));
 
-    FILE* statusFile = fopen("/sys/class/power_supply/BAT0/status", "r");
-    if(statusFile == NULL)
+    if(model[0] == '\0' && capacity[0] == '\0' && status[0] == '\0')
     {
-        ffPrintError(instance, "Battery", "fopen(\"/sys/class/power_supply/BAT0/status\", \"r\") == NULL");
+        ffPrintError(instance, "Battery", "No file in /sys/class/power_supply/BAT0/ could be read");
         return;
     }
-    char status[256];
-    scanned = fscanf(statusFile, "%s", status);
-    if(scanned != 1)
-    {
-        ffPrintError(instance, "Battery", "fscanf(statusFile, \"%u\", &status) != 1");
-        return;
-    }
-    fclose(statusFile);
-
-    uint32_t percentage = (now / (double) full) * 100;
 
     ffPrintLogoAndKey(instance, "Battery");
-    printf("%u%% [%s]\n", percentage, status);
+
+    if(model[0] != '\0')
+    {
+        printf("%s ", model);
+        
+        if(technology[0] != '\0')
+            printf("(%s) ", technology);
+    }
+
+    if(capacity[0] != '\0')
+    {
+        printf("[%s%%", capacity);
+    
+        if(status[0] == '\0')
+            puts("]");
+        else
+            printf("; %s]\n", status);
+    }
+    else
+    {
+        if(status[0] != '\0')
+            printf("%s", status);
+        else
+            putchar('\n');
+    }
+
 }
\ No newline at end of file
diff --git a/src/util.c b/src/util.c
index b23925c49..a8be92845 100644
--- a/src/util.c
+++ b/src/util.c
@@ -125,7 +125,7 @@ void ffTrimTrailingWhitespace(char* buffer)
         buffer[end + 1] = '\0';
 }
 
-static void getFileContent(const char* fileName, char* buffer, uint32_t bufferSize)
+void ffGetFileContent(const char* fileName, char* buffer, uint32_t bufferSize)
 {
     buffer[0] = '\0';
 
@@ -205,10 +205,11 @@ bool ffPrintCustomValue(FFinstance* instance, const char* key)
 {
     char fileName[256];
     strcpy(fileName, getConfigDir(instance));
+    strcat(fileName, "values/");
     strcat(fileName, key);
 
     char value[1024];
-    getFileContent(fileName, value, sizeof(value));
+    ffGetFileContent(fileName, value, sizeof(value));
 
     if(value[0] == '\0')
         return false;
@@ -234,7 +235,7 @@ bool ffPrintCachedValue(FFinstance* instance, const char* key)
     strcat(fileName, key);
 
     char value[1024];
-    getFileContent(fileName, value, sizeof(value));
+    ffGetFileContent(fileName, value, sizeof(value));
 
     if(value[0] == '\0')
         return false;