From 304f171d383ac6db2966c0200c5e06ee56541ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 19 Feb 2023 17:37:04 +0800 Subject: [PATCH] Battery / Wifi (Android): add more debug messages --- src/detection/battery/battery_android.c | 12 +++++++++--- src/detection/wifi/wifi_android.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index 0c4772c3e..d8c56e836 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -4,16 +4,22 @@ #include "common/processing.h" #include "common/properties.h" +#define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" +#define FF_TERMUX_API_PARAM "BatteryStatus" + const char* ffDetectBatteryImpl(FF_MAYBE_UNUSED FFinstance* instance, FFlist* results) { FF_STRBUF_AUTO_DESTROY buffer; ffStrbufInit(&buffer); if(ffProcessAppendStdOut(&buffer, (char* const[]){ - FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api", - "BatteryStatus" + FF_TERMUX_API_PATH, + FF_TERMUX_API_PARAM })) - return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " BatteryStatus` failed"; + return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; + + if(buffer.length == 0) + return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty"; BatteryResult* battery = ffListAdd(results); battery->temperature = FF_BATTERY_TEMP_UNSET; diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c index af1012fe7..5a304de4c 100644 --- a/src/detection/wifi/wifi_android.c +++ b/src/detection/wifi/wifi_android.c @@ -3,16 +3,22 @@ #include "common/processing.h" #include "common/properties.h" +#define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" +#define FF_TERMUX_API_PARAM "WifiConnectionInfo" + const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* result) { FF_STRBUF_AUTO_DESTROY buffer; ffStrbufInit(&buffer); if(ffProcessAppendStdOut(&buffer, (char* const[]){ - FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api", + FF_TERMUX_API_PATH, "WifiConnectionInfo" })) - return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " WifiConnectionInfo` failed"; + return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; + + if(buffer.length == 0) + return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints empty"; FFWifiResult* item = (FFWifiResult*)ffListAdd(result); ffStrbufInit(&item->inf.description);