fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 16:26:39 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Wifi: support JSON format

Browse Source
This commit is contained in:
李通洲
2023-09-13 14:01:15 +08:00
parent 9765885fe6
commit 3a8819d42b
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/wifi/wifi.c
+47 -1
View File
@@ -72,7 +72,7 @@ void ffPrintWifi(FFWifiOptions* options)
void ffInitWifiOptions(FFWifiOptions* options)
{
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WIFI_MODULE_NAME, ffParseWifiCommandOptions, ffParseWifiJsonObject, ffPrintWifi, NULL);
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_WIFI_MODULE_NAME, ffParseWifiCommandOptions, ffParseWifiJsonObject, ffPrintWifi, ffGenerateWifiJson);
ffOptionInitModuleArg(&options->moduleArgs);
}
@@ -107,3 +107,49 @@ void ffParseWifiJsonObject(FFWifiOptions* options, yyjson_val* module)
ffPrintError(FF_WIFI_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
}
}
void ffGenerateWifiJson(FF_MAYBE_UNUSED FFWifiOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFWifiResult));
const char* error = ffDetectWifi(&result);
if(error)
{
yyjson_mut_obj_add_str(doc, module, "error", error);
return;
}
if(!result.length)
{
yyjson_mut_obj_add_str(doc, module, "error", "No Wifi interfaces found");
return;
}
yyjson_mut_val* arr = yyjson_mut_obj_add_arr(doc, module, "result");
FF_LIST_FOR_EACH(FFWifiResult, wifi, result)
{
yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr);
yyjson_mut_val* inf = yyjson_mut_obj_add_obj(doc, obj, "inf");
yyjson_mut_obj_add_strbuf(doc, inf, "description", &wifi->inf.description);
yyjson_mut_obj_add_strbuf(doc, inf, "status", &wifi->inf.status);
yyjson_mut_val* conn = yyjson_mut_obj_add_obj(doc, obj, "conn");
yyjson_mut_obj_add_strbuf(doc, conn, "status", &wifi->conn.status);
yyjson_mut_obj_add_strbuf(doc, conn, "ssid", &wifi->conn.ssid);
yyjson_mut_obj_add_strbuf(doc, conn, "macAddress", &wifi->conn.macAddress);
yyjson_mut_obj_add_strbuf(doc, conn, "protocol", &wifi->conn.protocol);
yyjson_mut_obj_add_real(doc, conn, "signalQuality", wifi->conn.signalQuality);
yyjson_mut_obj_add_real(doc, conn, "rxRate", wifi->conn.rxRate);
yyjson_mut_obj_add_real(doc, conn, "txRate", wifi->conn.txRate);
}
FF_LIST_FOR_EACH(FFWifiResult, item, result)
{
ffStrbufDestroy(&item->inf.description);
ffStrbufDestroy(&item->inf.status);
ffStrbufDestroy(&item->conn.status);
ffStrbufDestroy(&item->conn.ssid);
ffStrbufDestroy(&item->conn.macAddress);
ffStrbufDestroy(&item->conn.protocol);
ffStrbufDestroy(&item->conn.security);
}
}
src/modules/wifi/wifi.h
+1
View File
@@ -9,3 +9,4 @@ void ffInitWifiOptions(FFWifiOptions* options);
bool ffParseWifiCommandOptions(FFWifiOptions* options, const char* key, const char* value);
void ffDestroyWifiOptions(FFWifiOptions* options);
void ffParseWifiJsonObject(FFWifiOptions* options, yyjson_val* module);
void ffGenerateWifiJson(FFWifiOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module);