fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: returns false when an error is printed

Browse Source
This commit is contained in:
李通洲
2026-06-05 22:18:53 +08:00
parent 135547fd50
commit e24e3b6b29
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/bluetooth/bluetooth.c
+1
View File
@@ -66,6 +66,7 @@ bool ffPrintBluetooth(FFBluetoothOptions* options) {
if (devices.length == 0) {
ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No bluetooth devices found");
return false;
}
uint8_t i = 1;
src/modules/bluetoothradio/bluetoothradio.c
+1
View File
@@ -113,6 +113,7 @@ bool ffPrintBluetoothRadio(FFBluetoothRadioOptions* options) {
} else {
ffPrintError(FF_BLUETOOTHRADIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No devices detected");
}
return false;
}
FF_LIST_FOR_EACH (FFBluetoothRadioResult, radio, radios) {
src/modules/gpu/gpu.c
+10 -9
View File
@@ -196,10 +196,6 @@ bool ffPrintGPU(FFGPUOptions* options) {
++i;
}
if (selectedGPUs.length == 0) {
ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No GPUs found");
}
FF_LIST_FOR_EACH (FFGPUResult, gpu, gpus) {
ffStrbufDestroy(&gpu->vendor);
ffStrbufDestroy(&gpu->name);
@@ -208,6 +204,11 @@ bool ffPrintGPU(FFGPUOptions* options) {
ffStrbufDestroy(&gpu->memoryType);
}
if (selectedGPUs.length == 0) {
ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, (gpus.length > 0 ? "GPUs found but all hidden by hideType option" : "No GPUs detected"));
return false;
}
return true;
}
@@ -230,7 +231,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) {
if (unsafe_yyjson_equals_str(key, "detectionMethod")) {
int value;
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]){
{ "auto", FF_GPU_DETECTION_METHOD_AUTO },
{ "pci", FF_GPU_DETECTION_METHOD_PCI },
{ "vulkan", FF_GPU_DETECTION_METHOD_VULKAN },
@@ -251,7 +252,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) {
options->hideType = FF_GPU_TYPE_NONE;
} else {
int value;
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]) {
const char* error = ffJsonConfigParseEnum(val, &value, (FFKeyValuePair[]){
{ "none", FF_GPU_TYPE_NONE },
{ "unknown", FF_GPU_TYPE_UNKNOWN },
{ "integrated", FF_GPU_TYPE_INTEGRATED },
@@ -445,8 +446,8 @@ void ffInitGPUOptions(FFGPUOptions* options) {
;
options->temp = false;
options->hideType = FF_GPU_TYPE_NONE;
options->tempConfig = (FFColorRangeConfig) { 60, 80 };
options->percent = (FFPercentageModuleConfig) { 50, 80, 0 };
options->tempConfig = (FFColorRangeConfig){ 60, 80 };
options->percent = (FFPercentageModuleConfig){ 50, 80, 0 };
}
void ffDestroyGPUOptions(FFGPUOptions* options) {
@@ -462,7 +463,7 @@ FFModuleBaseInfo ffGPUModuleInfo = {
.printModule = (void*) ffPrintGPU,
.generateJsonResult = (void*) ffGenerateGPUJsonResult,
.generateJsonConfig = (void*) ffGenerateGPUJsonConfig,
.formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
.formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]){
{ "GPU vendor", "vendor" },
{ "GPU name", "name" },
{ "GPU driver", "driver" },