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

DateTime: support JSON printing

Browse Source
This commit is contained in:
李通洲
2023-08-31 11:24:15 +08:00
parent a4fababb71
commit 632718e1d0
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/jsonconfig.h
+1 -1
View File
@@ -12,6 +12,6 @@ const char* ffParseLibraryJsonConfig(void);
yyjson_api_inline bool yyjson_mut_obj_add_strbuf(yyjson_mut_doc *doc,
yyjson_mut_val *obj,
const char *_key,
FFstrbuf* buf) {
const FFstrbuf* buf) {
return yyjson_mut_obj_add_strncpy(doc, obj, _key, buf->chars, buf->length);
}
src/modules/datetime/datetime.c
+29 -1
View File
@@ -51,7 +51,7 @@ void ffPrintDateTime(FFDateTimeOptions* options)
void ffInitDateTimeOptions(FFDateTimeOptions* options)
{
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DATETIME_MODULE_NAME, ffParseDateTimeCommandOptions, ffParseDateTimeJsonObject, ffPrintDateTime, NULL);
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_DATETIME_MODULE_NAME, ffParseDateTimeCommandOptions, ffParseDateTimeJsonObject, ffPrintDateTime, ffGenerateDateTimeJson);
ffOptionInitModuleArg(&options->moduleArgs);
}
@@ -86,3 +86,31 @@ void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module)
ffPrintError(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
}
}
void ffGenerateDateTimeJson(FF_MAYBE_UNUSED FFDateTimeOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
const FFDateTimeResult* result = ffDetectDateTime();
yyjson_mut_val* obj = yyjson_mut_obj(doc);
yyjson_mut_obj_add_val(doc, module, "result", obj);
yyjson_mut_obj_add_uint(doc, obj, "year", result->year);
yyjson_mut_obj_add_uint(doc, obj, "yearShort", result->yearShort);
yyjson_mut_obj_add_uint(doc, obj, "month", result->month);
yyjson_mut_obj_add_strbuf(doc, obj, "monthPretty", &result->monthPretty);
yyjson_mut_obj_add_strbuf(doc, obj, "monthName", &result->monthName);
yyjson_mut_obj_add_strbuf(doc, obj, "monthNameShort", &result->monthNameShort);
yyjson_mut_obj_add_uint(doc, obj, "week", result->week);
yyjson_mut_obj_add_strbuf(doc, obj, "weekday", &result->weekday);
yyjson_mut_obj_add_strbuf(doc, obj, "weekdaySort", &result->weekdayShort);
yyjson_mut_obj_add_uint(doc, obj, "dayInYear", result->dayInYear);
yyjson_mut_obj_add_uint(doc, obj, "dayInMonth", result->dayInMonth);
yyjson_mut_obj_add_uint(doc, obj, "dayInWeek", result->dayInWeek);
yyjson_mut_obj_add_uint(doc, obj, "hour", result->hour);
yyjson_mut_obj_add_strbuf(doc, obj, "hourPretty", &result->hourPretty);
yyjson_mut_obj_add_uint(doc, obj, "hour12", result->hour12);
yyjson_mut_obj_add_strbuf(doc, obj, "hour12Pretty", &result->hour12Pretty);
yyjson_mut_obj_add_uint(doc, obj, "minute", result->minute);
yyjson_mut_obj_add_strbuf(doc, obj, "minutePretty", &result->minutePretty);
yyjson_mut_obj_add_uint(doc, obj, "second", result->second);
yyjson_mut_obj_add_strbuf(doc, obj, "secondPretty", &result->secondPretty);
}
src/modules/datetime/datetime.h
+1
View File
@@ -9,3 +9,4 @@ void ffInitDateTimeOptions(FFDateTimeOptions* options);
bool ffParseDateTimeCommandOptions(FFDateTimeOptions* options, const char* key, const char* value);
void ffDestroyDateTimeOptions(FFDateTimeOptions* options);
void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module);
void ffGenerateDateTimeJson(FFDateTimeOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module);