fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-08 22:20:17 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Bluetooth: adds option showType

Browse Source
This commit is contained in:
Carter Li
2026-09-23 15:11:06 +08:00
parent a78d2a7737
commit 4a97cc6825
10 changed files with 160 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/bluetooth/bluetooth.c
+33 -1
View File
@@ -1,7 +1,6 @@
#include "common/percent.h"
#include "common/printing.h"
#include "common/jsonconfig.h"
#include "common/strutil.h"
#include "detection/bluetooth/bluetooth.h"
#include "modules/bluetooth/bluetooth.h"
@@ -120,6 +119,22 @@ void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module)
continue;
}
if (unsafe_yyjson_equals_str(key, "showType")) {
int value;
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
{ "classic", FF_BLUETOOTH_DEVICE_TYPE_CLASSIC_BIT },
{ "le", FF_BLUETOOTH_DEVICE_TYPE_LE_BIT },
{ "both", FF_BLUETOOTH_DEVICE_TYPE_BOTH },
{},
});
if (error) {
ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bluetooth), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
} else {
options->showType = (FFBluetoothDeviceType) value;
}
continue;
}
if (ffPercentParseJsonObject(key, val, &options->percent)) {
continue;
}
@@ -133,6 +148,21 @@ void ffGenerateBluetoothJsonConfig(FFBluetoothOptions* options, yyjson_mut_doc*
yyjson_mut_obj_add_bool(doc, module, "showDisconnected", options->showDisconnected);
switch (options->showType) {
case FF_BLUETOOTH_DEVICE_TYPE_CLASSIC_BIT:
yyjson_mut_obj_add_str(doc, module, "showType", "classic");
break;
case FF_BLUETOOTH_DEVICE_TYPE_LE_BIT:
yyjson_mut_obj_add_str(doc, module, "showType", "le");
break;
case FF_BLUETOOTH_DEVICE_TYPE_BOTH:
yyjson_mut_obj_add_str(doc, module, "showType", "both");
break;
case FF_BLUETOOTH_DEVICE_TYPE_NONE:
default:
break;
}
ffPercentGenerateJsonConfig(doc, module, options->percent);
}
@@ -181,6 +211,8 @@ bool ffGenerateBluetoothJsonResult(FFBluetoothOptions* options, yyjson_mut_doc*
void ffInitBluetoothOptions(FFBluetoothOptions* options) {
ffOptionInitModuleArg(&options->moduleArgs, "");
options->showDisconnected = false;
// Both stacks are walked by default; `showType` exists to switch one off, not to switch one on.
options->showType = FF_BLUETOOTH_DEVICE_TYPE_BOTH;
options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };
}