From 6a65803929ccb8282e1f72b85ed3b702ce60b0d4 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Sun, 30 May 2021 21:35:04 +0200
Subject: [PATCH] prettier battery output

---
 src/fastfetch.c       |  2 +-
 src/modules/battery.c | 30 +++++++++---------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/fastfetch.c b/src/fastfetch.c
index 3d5d6029d..185dd3d3b 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -443,7 +443,7 @@ static inline void printCommandHelp(const char* command)
     }
     else if(strcasecmp(command, "battery-format") == 0)
     {
-        constructAndPrintCommandHelpFormat("battery", "{} {} ({}) [{}%; {}]", 5,
+        constructAndPrintCommandHelpFormat("battery", "{}%, {}", 5,
             "Battery manufactor",
             "Battery model",
             "Battery technology",
diff --git a/src/modules/battery.c b/src/modules/battery.c
index 519fb7181..77085eace 100644
--- a/src/modules/battery.c
+++ b/src/modules/battery.c
@@ -38,7 +38,7 @@ static void printBattery(FFinstance* instance, FFstrbuf* dir, uint32_t index)
     if(ffStrbufIgnCaseCompS(&status, "Unknown") == 0)
         ffStrbufClear(&status);
 
-    if(manufactor.length == 0 && model.length == 0 && technology.length == 0 && capacity.length == 0 && status.length == 0)
+    if(capacity.length == 0 && status.length == 0)
     {
         ffPrintError(instance, FF_BATTERY_MODULE_NAME, index, &instance->config.batteryKey, &instance->config.batteryFormat, FF_BATTERY_NUM_FORMAT_ARGS, "No file in %s could be read or all battery options are disabled", dir->chars);
         return;
@@ -49,31 +49,19 @@ static void printBattery(FFinstance* instance, FFstrbuf* dir, uint32_t index)
 
         ffPrintLogoAndKey(instance, FF_BATTERY_MODULE_NAME, index, &instance->config.batteryKey);
 
-        if(manufactor.length > 0)
-            printf("%s ", manufactor.chars);
-
-        if(model.length > 0)
-            printf("%s ", model.chars);
-
-        if(technology.length > 0)
-            printf("(%s) ", technology.chars);
-
         if(capacity.length > 0)
         {
-            printf("[%s%%", capacity.chars);
+            ffStrbufWriteTo(&capacity, stdout);
+            putchar('%');
 
-            if(status.length == 0)
-                puts("]");
-            else
-                printf("; %s]\n", status.chars);
-        }
-        else
-        {
             if(status.length > 0)
-                printf("[%s]", status.chars);
-            else
-                putchar('\n');
+                fputs(", ", stdout);
         }
+
+        if(status.length > 0)
+            ffStrbufWriteTo(&status, stdout);
+
+        putchar('\n');
     }
     else
     {