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

Separator: rename property length with times

Browse Source
This commit is contained in:
李通洲
2025-09-09 09:50:52 +08:00
parent 5f9e7c799a
commit 8eafec479e
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/json_schema.json
+2 -2
View File
@@ -3687,8 +3687,8 @@
"description": "Set the color of the separator line",
"$ref": "#/$defs/outputColor"
},
"length": {
"description": "Set the length of the separator line, or 0 to auto-detect",
"times": {
"description": "Set the times of separator string to repeat, or 0 to auto-detect",
"type": "integer",
"minimum": 0,
"default": 0
src/modules/separator/option.h
+1 -1
View File
@@ -6,7 +6,7 @@ typedef struct FFSeparatorOptions
{
FFstrbuf string;
FFstrbuf outputColor;
uint32_t length;
uint32_t times;
} FFSeparatorOptions;
static_assert(sizeof(FFSeparatorOptions) <= FF_OPTION_MAX_SIZE, "FFSeparatorOptions size exceeds maximum allowed size");
src/modules/separator/separator.c
+12 -6
View File
@@ -40,13 +40,13 @@ bool ffPrintSeparator(FFSeparatorOptions* options)
if(options->outputColor.length && !instance.config.display.pipe)
ffPrintColor(&options->outputColor);
if (options->length > 0)
if (options->times > 0)
{
if(__builtin_expect(options->string.length == 1, 1))
ffPrintCharTimes(options->string.chars[0], options->length);
ffPrintCharTimes(options->string.chars[0], options->times);
else
{
for (uint32_t i = 0; i < options->length; i++)
for (uint32_t i = 0; i < options->times; i++)
{
fputs(options->string.chars, stdout);
}
@@ -136,9 +136,15 @@ void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module)
continue;
}
if (unsafe_yyjson_equals_str(key, "times"))
{
options->times = (uint32_t) yyjson_get_uint(val);
continue;
}
if (unsafe_yyjson_equals_str(key, "length"))
{
options->length = (uint32_t) yyjson_get_uint(val);
ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "The option length has been renamed to times.");
continue;
}
@@ -150,14 +156,14 @@ void ffGenerateSeparatorJsonConfig(FFSeparatorOptions* options, yyjson_mut_doc*
{
yyjson_mut_obj_add_strbuf(doc, module, "string", &options->string);
yyjson_mut_obj_add_strbuf(doc, module, "outputColor", &options->outputColor);
yyjson_mut_obj_add_uint(doc, module, "length", options->length);
yyjson_mut_obj_add_uint(doc, module, "times", options->times);
}
void ffInitSeparatorOptions(FFSeparatorOptions* options)
{
ffStrbufInitStatic(&options->string, "-");
ffStrbufInit(&options->outputColor);
options->length = 0;
options->times = 0;
}
void ffDestroySeparatorOptions(FFSeparatorOptions* options)