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

Bluetooth: improvements

Browse Source 
1. fix memleaks
2. fix `show-disconnected` option parsing
3. print `[disconnected]` for disconnected device
This commit is contained in:
李通洲
2023-06-24 15:58:37 +08:00
parent 726ed35f61
commit b84720c040
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/bluetooth/bluetooth.c
+26 -19
View File
@@ -16,7 +16,10 @@ static void printDevice(FFBluetoothOptions* options, const FFBluetoothDevice* de
if(device->battery > 0)
printf(" (%d%%)", device->battery);
putchar('\n');
if(!device->connected)
puts(" [disconnected]");
else
putchar('\n');
}
else
{
@@ -37,29 +40,29 @@ void ffPrintBluetooth(FFBluetoothOptions* options)
if(error)
{
ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
return;
}
FF_LIST_AUTO_DESTROY filtered = ffListCreate(sizeof(FFBluetoothDevice*));
FF_LIST_FOR_EACH(FFBluetoothDevice, device, devices)
else
{
if(!device->connected && !options->showDisconnected)
continue;
FF_LIST_AUTO_DESTROY filtered = ffListCreate(sizeof(FFBluetoothDevice*));
*(FFBluetoothDevice**)ffListAdd(&filtered) = device;
}
FF_LIST_FOR_EACH(FFBluetoothDevice, device, devices)
{
if(!device->connected && !options->showDisconnected)
continue;
if(filtered.length == 0)
{
ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "No bluetooth devices found");
return;
}
*(FFBluetoothDevice**)ffListAdd(&filtered) = device;
}
for(uint32_t i = 0; i < filtered.length; i++)
{
uint8_t index = (uint8_t) (filtered.length == 1 ? 0 : i + 1);
printDevice(options, *(FFBluetoothDevice**)ffListGet(&filtered, i), index);
if(filtered.length == 0)
{
ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "No bluetooth devices found");
}
for(uint32_t i = 0; i < filtered.length; i++)
{
uint8_t index = (uint8_t) (filtered.length == 1 ? 0 : i + 1);
printDevice(options, *(FFBluetoothDevice**)ffListGet(&filtered, i), index);
}
}
FF_LIST_FOR_EACH(FFBluetoothDevice, device, devices)
@@ -85,7 +88,11 @@ bool ffParseBluetoothCommandOptions(FFBluetoothOptions* options, const char* key
return true;
if (ffStrEqualsIgnCase(subKey, "show-disconnected"))
{
options->showDisconnected = ffOptionParseBoolean(value);
return true;
}
return false;
}