TerminalSize: support JSON format

This commit is contained in:
李通洲
2023-09-12 16:17:17 +08:00
parent a927f4a04d
commit 4124c12bac
2 changed files with 19 additions and 1 deletions
+18 -1
View File
@@ -41,7 +41,7 @@ void ffPrintTerminalSize(FFTerminalSizeOptions* options)
void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options)
{
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINALSIZE_MODULE_NAME, ffParseTerminalSizeCommandOptions, ffParseTerminalSizeJsonObject, ffPrintTerminalSize, NULL);
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_TERMINALSIZE_MODULE_NAME, ffParseTerminalSizeCommandOptions, ffParseTerminalSizeJsonObject, ffPrintTerminalSize, ffGenerateTerminalSizeJson);
ffOptionInitModuleArg(&options->moduleArgs);
}
@@ -76,3 +76,20 @@ void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* m
ffPrintError(FF_TERMINALSIZE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
}
}
void ffGenerateTerminalSizeJson(FF_MAYBE_UNUSED FFTerminalOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
{
FFTerminalSizeResult result;
if(!ffDetectTerminalSize(&result))
{
yyjson_mut_obj_add_str(doc, module, "error", "Failed to detect terminal size");
return;
}
yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
yyjson_mut_obj_add_uint(doc, obj, "columns", result.columns);
yyjson_mut_obj_add_uint(doc, obj, "rows", result.rows);
yyjson_mut_obj_add_uint(doc, obj, "width", result.width);
yyjson_mut_obj_add_uint(doc, obj, "height", result.height);
}
+1
View File
@@ -9,3 +9,4 @@ void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options);
bool ffParseTerminalSizeCommandOptions(FFTerminalSizeOptions* options, const char* key, const char* value);
void ffDestroyTerminalSizeOptions(FFTerminalSizeOptions* options);
void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* module);
void ffGenerateTerminalSizeJson(FFTerminalOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module);