Chore: run clang-format

```bash
find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) ! -path "src/3rdparty/*" -print0 | xargs -0 clang-format -i
```
This commit is contained in:
李通洲
2026-03-29 09:28:49 +08:00
parent cdd4cee968
commit e0eba8ce21
690 changed files with 28093 additions and 30062 deletions
+87 -103
View File
@@ -7,30 +7,26 @@
#include "detection/battery/battery.h"
#include "modules/battery/battery.h"
static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uint8_t index)
{
static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uint8_t index) {
FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
if (options->moduleArgs.key.length == 0)
{
if (result->modelName.length > 0)
if (options->moduleArgs.key.length == 0) {
if (result->modelName.length > 0) {
ffStrbufSetF(&key, "%s (%s)", FF_BATTERY_MODULE_NAME, result->modelName.chars);
else
} else {
ffStrbufSetS(&key, FF_BATTERY_MODULE_NAME);
}
else
{
}
} else {
ffStrbufClear(&key);
FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
FF_ARG(index, "index"),
FF_ARG(result->modelName, "name"),
FF_ARG(options->moduleArgs.keyIcon, "icon"),
}));
FF_ARG(index, "index"),
FF_ARG(result->modelName, "name"),
FF_ARG(options->moduleArgs.keyIcon, "icon"),
}));
}
FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
if(options->moduleArgs.outputFormat.length == 0)
{
if (options->moduleArgs.outputFormat.length == 0) {
ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
@@ -39,51 +35,47 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
result->status.length > 0 &&
ffStrbufIgnCaseCompS(&result->status, "Unknown") != 0;
if(result->capacity >= 0)
{
if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
{
if (result->capacity >= 0) {
if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT) {
ffPercentAppendBar(&str, result->capacity, options->percent, &options->moduleArgs);
}
if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
{
if(str.length > 0)
if (percentType & FF_PERCENTAGE_TYPE_NUM_BIT) {
if (str.length > 0) {
ffStrbufAppendC(&str, ' ');
}
ffPercentAppendNum(&str, result->capacity, options->percent, str.length > 0, &options->moduleArgs);
}
if(result->timeRemaining > 0)
{
if(str.length > 0)
if (result->timeRemaining > 0) {
if (str.length > 0) {
ffStrbufAppendS(&str, " (");
}
ffDurationAppendNum((uint32_t) result->timeRemaining, &str);
ffStrbufAppendS(&str, " remaining)");
}
}
if(showStatus)
{
if(str.length > 0)
if (showStatus) {
if (str.length > 0) {
ffStrbufAppendF(&str, " [%s]", result->status.chars);
else
} else {
ffStrbufAppend(&str, &result->status);
}
}
if(result->temperature != FF_BATTERY_TEMP_UNSET)
{
if(str.length > 0)
if (result->temperature != FF_BATTERY_TEMP_UNSET) {
if (str.length > 0) {
ffStrbufAppendS(&str, " - ");
}
ffTempsAppendNum(result->temperature, &str, options->tempConfig, &options->moduleArgs);
}
ffStrbufPutTo(&str, stdout);
}
else
{
} else {
uint32_t timeRemaining = result->timeRemaining < 0 ? 0 : (uint32_t) result->timeRemaining;
uint32_t seconds = timeRemaining % 60;
timeRemaining /= 60;
@@ -94,62 +86,60 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
uint32_t days = timeRemaining;
FF_STRBUF_AUTO_DESTROY capacityNum = ffStrbufCreate();
if(percentType & FF_PERCENTAGE_TYPE_NUM_BIT)
if (percentType & FF_PERCENTAGE_TYPE_NUM_BIT) {
ffPercentAppendNum(&capacityNum, result->capacity, options->percent, false, &options->moduleArgs);
}
FF_STRBUF_AUTO_DESTROY capacityBar = ffStrbufCreate();
if(percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
if (percentType & FF_PERCENTAGE_TYPE_BAR_BIT) {
ffPercentAppendBar(&capacityBar, result->capacity, options->percent, &options->moduleArgs);
}
FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
ffTempsAppendNum(result->temperature, &tempStr, options->tempConfig, &options->moduleArgs);
FF_STRBUF_AUTO_DESTROY timeStr = ffStrbufCreate();
if (result->timeRemaining > 0)
if (result->timeRemaining > 0) {
ffDurationAppendNum((uint32_t) result->timeRemaining, &timeStr);
}
FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
FF_ARG(result->manufacturer, "manufacturer"),
FF_ARG(result->modelName, "model-name"),
FF_ARG(result->technology, "technology"),
FF_ARG(capacityNum, "capacity"),
FF_ARG(result->status, "status"),
FF_ARG(tempStr, "temperature"),
FF_ARG(result->cycleCount, "cycle-count"),
FF_ARG(result->serial, "serial"),
FF_ARG(result->manufactureDate, "manufacture-date"),
FF_ARG(capacityBar, "capacity-bar"),
FF_ARG(days, "time-days"),
FF_ARG(hours, "time-hours"),
FF_ARG(minutes, "time-minutes"),
FF_ARG(seconds, "time-seconds"),
FF_ARG(timeStr, "time-formatted"),
}));
FF_ARG(result->manufacturer, "manufacturer"),
FF_ARG(result->modelName, "model-name"),
FF_ARG(result->technology, "technology"),
FF_ARG(capacityNum, "capacity"),
FF_ARG(result->status, "status"),
FF_ARG(tempStr, "temperature"),
FF_ARG(result->cycleCount, "cycle-count"),
FF_ARG(result->serial, "serial"),
FF_ARG(result->manufactureDate, "manufacture-date"),
FF_ARG(capacityBar, "capacity-bar"),
FF_ARG(days, "time-days"),
FF_ARG(hours, "time-hours"),
FF_ARG(minutes, "time-minutes"),
FF_ARG(seconds, "time-seconds"),
FF_ARG(timeStr, "time-formatted"),
}));
}
}
bool ffPrintBattery(FFBatteryOptions* options)
{
bool ffPrintBattery(FFBatteryOptions* options) {
FF_LIST_AUTO_DESTROY results = ffListCreate(sizeof(FFBatteryResult));
const char* error = ffDetectBattery(options, &results);
if (error)
{
if (error) {
ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
return false;
}
if(results.length == 0)
{
if (results.length == 0) {
ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "No batteries found");
return false;
}
for(uint32_t i = 0; i < results.length; i++)
{
for (uint32_t i = 0; i < results.length; i++) {
FFBatteryResult* result = FF_LIST_GET(FFBatteryResult, results, i);
printBattery(options, result, results.length == 1 ? 0 : (uint8_t) (i + 1));
}
FF_LIST_FOR_EACH(FFBatteryResult, result, results)
{
FF_LIST_FOR_EACH (FFBatteryResult, result, results) {
ffStrbufDestroy(&result->manufacturer);
ffStrbufDestroy(&result->modelName);
ffStrbufDestroy(&result->technology);
@@ -160,60 +150,56 @@ bool ffPrintBattery(FFBatteryOptions* options)
return true;
}
void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module)
{
void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) {
yyjson_val *key, *val;
size_t idx, max;
yyjson_obj_foreach(module, idx, max, key, val)
{
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
yyjson_obj_foreach (module, idx, max, key, val) {
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs)) {
continue;
}
#ifdef _WIN32
if (unsafe_yyjson_equals_str(key, "useSetupApi"))
{
#ifdef _WIN32
if (unsafe_yyjson_equals_str(key, "useSetupApi")) {
options->useSetupApi = yyjson_get_bool(val);
continue;
}
#endif
#endif
if (ffTempsParseJsonObject(key, val, &options->temp, &options->tempConfig))
if (ffTempsParseJsonObject(key, val, &options->temp, &options->tempConfig)) {
continue;
}
if (ffPercentParseJsonObject(key, val, &options->percent))
if (ffPercentParseJsonObject(key, val, &options->percent)) {
continue;
}
ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
}
}
void ffGenerateBatteryJsonConfig(FFBatteryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
void ffGenerateBatteryJsonConfig(FFBatteryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
ffJsonConfigGenerateModuleArgsConfig(doc, module, &options->moduleArgs);
#ifdef _WIN32
yyjson_mut_obj_add_bool(doc, module, "useSetupApi", options->useSetupApi);
#endif
#ifdef _WIN32
yyjson_mut_obj_add_bool(doc, module, "useSetupApi", options->useSetupApi);
#endif
ffTempsGenerateJsonConfig(doc, module, options->temp, options->tempConfig);
ffPercentGenerateJsonConfig(doc, module, options->percent);
}
bool ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
bool ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) {
FF_LIST_AUTO_DESTROY results = ffListCreate(sizeof(FFBatteryResult));
const char* error = ffDetectBattery(options, &results);
if (error)
{
if (error) {
yyjson_mut_obj_add_str(doc, module, "error", error);
return false;
}
yyjson_mut_val* arr = yyjson_mut_obj_add_arr(doc, module, "result");
FF_LIST_FOR_EACH(FFBatteryResult, battery, results)
{
FF_LIST_FOR_EACH (FFBatteryResult, battery, results) {
yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr);
yyjson_mut_obj_add_real(doc, obj, "capacity", battery->capacity);
yyjson_mut_obj_add_strbuf(doc, obj, "manufacturer", &battery->manufacturer);
@@ -222,19 +208,20 @@ bool ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc,
yyjson_mut_obj_add_strbuf(doc, obj, "status", &battery->status);
yyjson_mut_obj_add_strbuf(doc, obj, "technology", &battery->technology);
yyjson_mut_obj_add_strbuf(doc, obj, "serial", &battery->serial);
if (battery->temperature != FF_BATTERY_TEMP_UNSET)
if (battery->temperature != FF_BATTERY_TEMP_UNSET) {
yyjson_mut_obj_add_real(doc, obj, "temperature", battery->temperature);
else
} else {
yyjson_mut_obj_add_null(doc, obj, "temperature");
}
yyjson_mut_obj_add_uint(doc, obj, "cycleCount", battery->cycleCount);
if (battery->timeRemaining > 0)
if (battery->timeRemaining > 0) {
yyjson_mut_obj_add_int(doc, obj, "timeRemaining", battery->timeRemaining);
else
} else {
yyjson_mut_obj_add_null(doc, obj, "timeRemaining");
}
}
FF_LIST_FOR_EACH(FFBatteryResult, battery, results)
{
FF_LIST_FOR_EACH (FFBatteryResult, battery, results) {
ffStrbufDestroy(&battery->manufacturer);
ffStrbufDestroy(&battery->manufactureDate);
ffStrbufDestroy(&battery->modelName);
@@ -246,20 +233,18 @@ bool ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc,
return true;
}
void ffInitBatteryOptions(FFBatteryOptions* options)
{
void ffInitBatteryOptions(FFBatteryOptions* options) {
ffOptionInitModuleArg(&options->moduleArgs, "");
options->temp = false;
options->tempConfig = (FFColorRangeConfig) { 60, 80 };
options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };
options->tempConfig = (FFColorRangeConfig) {60, 80};
options->percent = (FFPercentageModuleConfig) {50, 20, 0};
#ifdef _WIN32
options->useSetupApi = false;
#endif
#ifdef _WIN32
options->useSetupApi = false;
#endif
}
void ffDestroyBatteryOptions(FFBatteryOptions* options)
{
void ffDestroyBatteryOptions(FFBatteryOptions* options) {
ffOptionDestroyModuleArg(&options->moduleArgs);
}
@@ -288,5 +273,4 @@ FFModuleBaseInfo ffBatteryModuleInfo = {
{"Battery time remaining minutes", "time-minutes"},
{"Battery time remaining seconds", "time-seconds"},
{"Battery time remaining (formatted)", "time-formatted"},
}))
};
}))};
+4 -5
View File
@@ -3,17 +3,16 @@
#include "common/option.h"
#include "common/percent.h"
typedef struct FFBatteryOptions
{
typedef struct FFBatteryOptions {
FFModuleArgs moduleArgs;
bool temp;
FFColorRangeConfig tempConfig;
FFPercentageModuleConfig percent;
#ifdef _WIN32
bool useSetupApi;
#endif
#ifdef _WIN32
bool useSetupApi;
#endif
} FFBatteryOptions;
static_assert(sizeof(FFBatteryOptions) <= FF_OPTION_MAX_SIZE, "FFBatteryOptions size exceeds maximum allowed size");