Battery: use module options

src/detection/battery/battery.h

@@ -17,6 +17,6 @@ typedef struct BatteryResult
     double temperature;
 } BatteryResult;
 
-const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results);
+const char* ffDetectBattery(FFinstance* instance, FFBatteryOptions* options, FFlist* results);
 
 #endif

src/detection/battery/battery_android.c

@@ -7,7 +7,7 @@
 #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
 #define FF_TERMUX_API_PARAM "BatteryStatus"
 
-const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
+const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FFBatteryOptions* options, FFlist* results)
 {
     FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
 
@@ -34,7 +34,7 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
         ffStrbufClear(&battery->status);
     }
 
-    if(instance->config.battery.temp)
+    if(options->temp)
     {
         if(ffParsePropLines(buffer.chars, "\"temperature\": ", &battery->status))
         {

src/detection/battery/battery_apple.c

@@ -27,7 +27,7 @@ static double detectBatteryTemp()
     return result;
 }
 
-const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
+const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FFBatteryOptions* options, FFlist* results)
 {
     CFMutableDictionaryRef matchDict = IOServiceMatching("AppleSmartBattery");
     if (matchDict == NULL)
@@ -90,7 +90,7 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
         else
             ffStrbufAppendS(&battery->status, "");
 
-        if(instance->config.battery.temp)
+        if(options->temp)
             battery->temperature = detectBatteryTemp();
         else
             battery->temperature = FF_BATTERY_TEMP_UNSET;

src/detection/battery/battery_bsd.c

@@ -6,7 +6,7 @@
 #include <sys/fcntl.h>
 #include <unistd.h>
 
-const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* results)
+const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)
 {
     //https://www.freebsd.org/cgi/man.cgi?acpi_battery(4)
     //https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/panel-plugin/libacpi.c

src/detection/battery/battery_linux.c

@@ -67,13 +67,13 @@ static void parseBattery(FFstrbuf* dir, FFlist* results)
     result->temperature = FF_BATTERY_TEMP_UNSET;
 }
 
-const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
+const char* ffDetectBattery(FF_MAYBE_UNUSED FFinstance* instance, FFBatteryOptions* options, FFlist* results)
 {
     FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
 
-    if(instance->config.battery.dir.length > 0)
+    if(options->dir.length > 0)
     {
-        ffStrbufAppend(&baseDir, &instance->config.battery.dir);
+        ffStrbufAppend(&baseDir, &options->dir);
         ffStrbufEnsureEndsWithC(&baseDir, '/');
     }
     else

src/detection/battery/battery_nosupport.c

@@ -1,8 +1,8 @@
 #include "fastfetch.h"
 #include "battery.h"
 
-const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
+const char* ffDetectBattery(FFinstance* instance, FFBatteryOptions* options, FFlist* results)
 {
-    FF_UNUSED(instance, results)
+    FF_UNUSED(instance, options, results)
     return "Not supported on this platform";
 }

src/detection/battery/battery_windows.c

@@ -30,7 +30,7 @@ static inline void wrapSetupDiDestroyDeviceInfoList(HDEVINFO* hdev)
         SetupDiDestroyDeviceInfoList(*hdev);
 }
 
-const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
+const char* ffDetectBattery(FFinstance* instance, FFBatteryOptions* options, FFlist* results)
 {
     if(instance->config.allowSlowOperations)
     {
@@ -111,7 +111,7 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results)
             }
 
             battery->temperature = 0.0/0.0;
-            if(instance->config.battery.temp)
+            if(options->temp)
             {
                 bqi.InformationLevel = BatteryTemperature;
                 ULONG temp;

src/modules/battery/battery.c

@@ -76,7 +76,7 @@ void ffPrintBattery(FFinstance* instance, FFBatteryOptions* options)
     FFlist results;
     ffListInitA(&results, sizeof(BatteryResult), 0);
 
-    const char* error = ffDetectBatteryImpl(instance, &results);
+    const char* error = ffDetectBattery(instance, options, &results);
 
     if (error)
     {