diff --git a/CHANGELOG.md b/CHANGELOG.md
index e313dceac..8d9a648c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Features:
* Detect scaled resolutions (Windows, macOS)
* Optimise font module printing (Windows)
* Detect pacman package count inside MSYS2 environment (Windows)
+* Add Wifi / Battery module support for Android
Logos:
* Raspbian (@IamNoRobot, #373)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f07deeb2..453244774 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,7 +351,7 @@ elseif(ANDROID)
list(APPEND LIBFASTFETCH_SRC
src/common/networking_linux.c
src/common/processing_linux.c
- src/detection/battery/battery_nosupport.c
+ src/detection/battery/battery_android.c
src/detection/bios/bios_nosupport.c
src/detection/board/board_nosupport.c
src/detection/brightness/brightness_nosupport.c
@@ -378,7 +378,7 @@ elseif(ANDROID)
src/detection/terminalshell/terminalshell_linux.c
src/detection/uptime/uptime_linux.c
src/detection/users/users_linux.c
- src/detection/wifi/wifi_nosupport.c
+ src/detection/wifi/wifi_android.c
src/detection/wmtheme/wmtheme_nosupport.c
src/util/platform/FFPlatform_unix.c
)
diff --git a/README.md b/README.md
index a87eee346..c1d5dbb99 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,8 @@ Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for
+There are [screenshots on different platforms](https://github.com/LinusDierheimer/fastfetch/wiki)
+
## Customization
With customization and speed being two competing goals, this project actually builds two executables.
@@ -79,6 +81,7 @@ For the image logo, only chafa is supported due to [the design flaw of ConPTY](h
* [`freetype`](https://www.freetype.org/): Used for Termux font detection. [`freetype`](https://github.com/termux/termux-packages/tree/master/packages/freetype)
* [`libvulkan`](https://www.vulkan.org/): Vulkan module, also used for GPU detection. Usually has been provided by Android system. [`vulkan-loader-android`](https://github.com/termux/termux-packages/tree/master/packages/vulkan-loader-android) [`vulkan-headers`](https://github.com/termux/termux-packages/tree/master/packages/vulkan-headers)
+* [`termux-api`](https://github.com/termux/termux-api-package): Used for Wifi / Battery detection. Read [the official doc](https://wiki.termux.com/wiki/Termux:API) for detail or if you hang on these modules (IMPORTANT). [`termux-api`](https://github.com/termux/termux-packages/tree/master/packages/termux-api)
## Support status
All categories not listed here should work without needing a specific implementation.
diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c
new file mode 100644
index 000000000..0c4772c3e
--- /dev/null
+++ b/src/detection/battery/battery_android.c
@@ -0,0 +1,38 @@
+#include "fastfetch.h"
+#include "battery.h"
+
+#include "common/processing.h"
+#include "common/properties.h"
+
+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"
+ }))
+ return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " BatteryStatus` failed";
+
+ BatteryResult* battery = ffListAdd(results);
+ battery->temperature = FF_BATTERY_TEMP_UNSET;
+ ffStrbufInit(&battery->manufacturer);
+ ffStrbufInit(&battery->modelName);
+ ffStrbufInit(&battery->status);
+ ffStrbufInit(&battery->technology);
+
+ if(ffParsePropLines(buffer.chars, "\"percentage\": ", &battery->status))
+ {
+ battery->capacity = ffStrbufToDouble(&battery->status);
+ ffStrbufClear(&battery->status);
+ }
+
+ if(ffParsePropLines(buffer.chars, "\"status\": ", &battery->status))
+ {
+ ffStrbufTrimRight(&battery->status, ',');
+ ffStrbufTrim(&battery->status, '"');
+ }
+
+ return NULL;
+}
diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c
index 1b2bf28d6..73ce6eaca 100644
--- a/src/detection/cpu/cpu_linux.c
+++ b/src/detection/cpu/cpu_linux.c
@@ -67,7 +67,7 @@ static double getFrequency(const char* info, const char* scaling)
return getGHz(scaling);
}
-static double detectCPUTemp()
+static double detectCPUTemp(void)
{
const FFTempsResult* temps = ffDetectTemps();
@@ -107,7 +107,7 @@ static void parseIsa(FFstrbuf* cpuIsa)
void ffDetectCPUImpl(const FFinstance* instance, FFCPUResult* cpu)
{
if(instance->config.cpuTemp)
- cpu->temperature = detectCPUTemp(instance);
+ cpu->temperature = detectCPUTemp();
else
cpu->temperature = FF_CPU_TEMP_UNSET;
diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c
index 6b46a0af2..edf42b8ab 100644
--- a/src/detection/disk/disk_linux.c
+++ b/src/detection/disk/disk_linux.c
@@ -121,11 +121,11 @@ static void detectName(FFDisk* disk, const FFstrbuf* device)
#ifdef __ANDROID__
-static void detectType(const FFlist* devices, FFDisk* currentDisk, const char* options)
+static void detectType(FF_MAYBE_UNUSED const FFlist* devices, FFDisk* currentDisk, FF_MAYBE_UNUSED const char* options)
{
if(ffStrbufEqualS(¤tDisk->mountpoint, "/") || ffStrbufEqualS(¤tDisk->mountpoint, "/storage/emulated"))
currentDisk->type = FF_DISK_TYPE_REGULAR;
- else if(ffStrbufStartsWithS(&disk->mountpoint, "/mnt/media_rw/"))
+ else if(ffStrbufStartsWithS(¤tDisk->mountpoint, "/mnt/media_rw/"))
currentDisk->type = FF_DISK_TYPE_EXTERNAL;
else
currentDisk->type = FF_DISK_TYPE_HIDDEN;
diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c
new file mode 100644
index 000000000..af1012fe7
--- /dev/null
+++ b/src/detection/wifi/wifi_android.c
@@ -0,0 +1,62 @@
+#include "wifi.h"
+
+#include "common/processing.h"
+#include "common/properties.h"
+
+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",
+ "WifiConnectionInfo"
+ }))
+ return "Starting `" FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" " WifiConnectionInfo` failed";
+
+ FFWifiResult* item = (FFWifiResult*)ffListAdd(result);
+ ffStrbufInit(&item->inf.description);
+ ffStrbufInit(&item->inf.status);
+ ffStrbufInit(&item->conn.status);
+ ffStrbufInit(&item->conn.ssid);
+ ffStrbufInit(&item->conn.macAddress);
+ ffStrbufInit(&item->conn.protocol);
+ ffStrbufInit(&item->conn.security);
+ item->conn.signalQuality = 0.0/0.0;
+ item->conn.rxRate = 0.0/0.0;
+ item->conn.txRate = 0.0/0.0;
+
+ if(!ffParsePropLines(buffer.chars, "\"supplicant_state\": ", &item->inf.status))
+ ffStrbufAppendS(&item->inf.status, "Unknown");
+
+ {
+ ffStrbufTrimRight(&item->inf.status, ',');
+ ffStrbufTrim(&item->inf.status, '"');
+ if(!ffStrbufEqualS(&item->inf.status, "COMPLETED"))
+ return NULL;
+ }
+
+ if(ffParsePropLines(buffer.chars, "\"rssi\": ", &item->inf.description))
+ {
+ double rssi = ffStrbufToDouble(&item->inf.description);
+ item->conn.signalQuality = rssi >= -50 ? 100 : rssi <= -100 ? 0 : (rssi + 100) * 2;
+ ffStrbufClear(&item->inf.description);
+ }
+
+ if(ffParsePropLines(buffer.chars, "\"network_id\": ", &item->inf.description))
+ ffStrbufTrimRight(&item->inf.description, ',');
+
+ if(ffParsePropLines(buffer.chars, "\"bssid\": ", &item->conn.macAddress))
+ {
+ ffStrbufTrimRight(&item->conn.macAddress, ',');
+ ffStrbufTrim(&item->conn.macAddress, '"');
+ }
+
+ if(ffParsePropLines(buffer.chars, "\"ssid\": ", &item->conn.ssid))
+ {
+ ffStrbufTrimRight(&item->conn.ssid, ',');
+ ffStrbufTrim(&item->conn.ssid, '"');
+ }
+
+ return NULL;
+}
diff --git a/src/detection/wifi/wifi_apple.m b/src/detection/wifi/wifi_apple.m
index 417a4e3de..a83f79485 100644
--- a/src/detection/wifi/wifi_apple.m
+++ b/src/detection/wifi/wifi_apple.m
@@ -70,6 +70,9 @@ const char* ffDetectWifi(const FFinstance* instance, FFlist* result)
switch(inf.security)
{
+ case kCWSecurityNone:
+ ffStrbufAppendS(&item->conn.security, "Insecure");
+ break;
case kCWSecurityWEP:
ffStrbufAppendS(&item->conn.security, "WEP");
break;
diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c
index 4459b3e5a..a8f70620d 100644
--- a/src/detection/wifi/wifi_linux.c
+++ b/src/detection/wifi/wifi_linux.c
@@ -161,8 +161,6 @@ static const char* detectWifiWithLibnm(const FFinstance* instance, FFlist* resul
ffStrbufSetS(&item->conn.protocol, "802.11a/b/g");
}
}
- if(!item->conn.protocol.length)
- ffStrbufAppendS(&item->conn.protocol, "802.11");
NM80211ApFlags flags = ffnm_access_point_get_flags(ap);
NM80211ApSecurityFlags wpaFlags = ffnm_access_point_get_wpa_flags(ap);
@@ -188,7 +186,10 @@ static const char* detectWifiWithLibnm(const FFinstance* instance, FFlist* resul
|| (rsnFlags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
ffStrbufAppendS(&item->conn.security, "802.1X ");
}
- ffStrbufTrimRight(&item->conn.security, ' ');
+ if (!item->conn.security.length)
+ ffStrbufAppendS(&item->conn.security, "Insecure");
+ else
+ ffStrbufTrimRight(&item->conn.security, ' ');
}
ffg_object_unref(client);
@@ -294,9 +295,10 @@ static const char* detectWifiWithIoctls(FF_MAYBE_UNUSED const FFinstance* instan
case IW_ENCODE_ALG_AES_CMAC:
ffStrbufAppendS(&item->conn.security, "CMAC");
break;
+ default:
+ ffStrbufAppendF(&item->conn.security, "Unknown (%d)", (int) iwe->alg);
+ break;
}
- } else {
- ffStrbufAppendS(&item->conn.security, "unknown");
}
close(sock);
diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c
index 2f275061e..70d7ea577 100644
--- a/src/detection/wifi/wifi_windows.c
+++ b/src/detection/wifi/wifi_windows.c
@@ -198,6 +198,8 @@ const char* ffDetectWifi(FF_MAYBE_UNUSED const FFinstance* instance, FFlist* res
if(connInfo->wlanSecurityAttributes.bOneXEnabled)
ffStrbufAppendS(&item->conn.security, " 802.11X");
}
+ else
+ ffStrbufAppendS(&item->conn.security, "Insecure");
ffWlanFreeMemory(connInfo);
}
diff --git a/src/fastfetch.c b/src/fastfetch.c
index 2ab454993..18c130ef2 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -859,7 +859,35 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
}
else if(strcasecmp(key, "-v") == 0 || strcasecmp(key, "--version") == 0)
{
- puts("fastfetch "FASTFETCH_PROJECT_VERSION""FASTFETCH_PROJECT_VERSION_TWEAK);
+ #ifndef NDEBUG
+ #define FF_BUILD_TYPE "-debug"
+ #else
+ #define FF_BUILD_TYPE
+ #endif
+
+ #if defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64)
+ #define FF_ARCHITECTURE "x86_64"
+ #elif defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(__i586__) || defined(__i586) || defined(__i686__) || defined(__i686)
+ #define FF_ARCHITECTURE "i386"
+ #elif defined(__aarch64__)
+ #define FF_ARCHITECTURE "aarch64"
+ #elif defined(__arm__)
+ #define FF_ARCHITECTURE "arm"
+ #elif defined(__mips__)
+ #define FF_ARCHITECTURE "mips"
+ #elif defined(__powerpc__) || defined(__powerpc)
+ #define FF_ARCHITECTURE "powerpc"
+ #elif defined(__riscv__) || defined(__riscv)
+ #define FF_ARCHITECTURE "riscv"
+ #elif
+ #define FF_ARCHITECTURE "unknown"
+ #endif
+
+ puts("fastfetch " FASTFETCH_PROJECT_VERSION FASTFETCH_PROJECT_VERSION_TWEAK FF_BUILD_TYPE " (" FF_ARCHITECTURE ")");
+
+ #undef FF_ARCHITECTURE
+ #undef FF_BUILD_TYPE
+
exit(0);
}
else if(strcasecmp(key, "--version-raw") == 0)
diff --git a/src/modules/wifi.c b/src/modules/wifi.c
index bc1bbacbf..fa9d19caf 100644
--- a/src/modules/wifi.c
+++ b/src/modules/wifi.c
@@ -32,11 +32,12 @@ void ffPrintWifi(FFinstance* instance)
ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi.key);
if(item->conn.ssid.length)
{
- printf("%s - %s - %s\n",
- item->conn.ssid.chars,
- item->conn.protocol.chars,
- item->conn.security.length > 0 ? item->conn.security.chars : "insecure"
- );
+ ffStrbufWriteTo(&item->conn.ssid, stdout);
+ if(item->conn.protocol.length)
+ printf("- %s", item->conn.protocol.chars);
+ if(item->conn.security.length)
+ printf("- %s", item->conn.security.chars);
+ putchar('\n');
}
else
{