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

Board: support JSON config

Browse Source
This commit is contained in:
李通洲
2023-03-13 18:54:57 +08:00
parent fb2004a6f9
commit 5f3154acc6
12 changed files with 131 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -264,7 +264,7 @@ set(LIBFASTFETCH_SRC
src/modules/battery/battery.c
src/modules/bios/bios.c
src/modules/bluetooth/bluetooth.c
src/modules/board.c
src/modules/board/board.c
src/modules/brightness.c
src/modules/break.c
src/modules/chassis.c
src/common/init.c
+2 -2
View File
@@ -61,7 +61,7 @@ static void defaultConfig(FFinstance* instance)
ffInitOSOptions(&instance->config.os);
ffInitHostOptions(&instance->config.host);
ffInitBiosOptions(&instance->config.bios);
initModuleArg(&instance->config.board);
ffInitBoardOptions(&instance->config.board);
initModuleArg(&instance->config.brightness);
initModuleArg(&instance->config.chassis);
ffInitCommandOptions(&instance->config.command);
@@ -297,7 +297,7 @@ static void destroyConfig(FFinstance* instance)
ffDestroyOSOptions(&instance->config.os);
ffDestroyHostOptions(&instance->config.host);
ffDestroyBiosOptions(&instance->config.bios);
destroyModuleArg(&instance->config.board);
ffDestroyBoardOptions(&instance->config.board);
destroyModuleArg(&instance->config.chassis);
ffDestroyCommandOptions(&instance->config.command);
ffDestroyKernelOptions(&instance->config.kernel);
src/fastfetch.c
+2 -2
View File
@@ -1012,7 +1012,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(ffParseOSCommandOptions(&instance->config.os, key, value)) {}
else if(ffParseHostCommandOptions(&instance->config.host, key, value)) {}
else if(ffParseBiosCommandOptions(&instance->config.bios, key, value)) {}
else if(optionParseModuleArgs(key, value, "board", &instance->config.board)) {}
else if(ffParseBoardCommandOptions(&instance->config.board, key, value)) {}
else if(optionParseModuleArgs(key, value, "chassis", &instance->config.chassis)) {}
else if(ffParseCommandCommandOptions(&instance->config.command, key, value)) {}
else if(ffParseKernelCommandOptions(&instance->config.kernel, key, value)) {}
@@ -1263,7 +1263,7 @@ static void parseStructureCommand(FFinstance* instance, FFdata* data, const char
else if(strcasecmp(line, "bios") == 0)
ffPrintBios(instance, &instance->config.bios);
else if(strcasecmp(line, "board") == 0)
ffPrintBoard(instance);
ffPrintBoard(instance, &instance->config.board);
else if(strcasecmp(line, "brightness") == 0)
ffPrintBrightness(instance);
else if(strcasecmp(line, "chassis") == 0)
src/fastfetch.h
+1 -2
View File
@@ -95,7 +95,7 @@ typedef struct FFconfig
FFOSOptions os;
FFHostOptions host;
FFBiosOptions bios;
FFModuleArgs board;
FFBoardOptions board;
FFModuleArgs brightness;
FFModuleArgs chassis;
FFCommandOptions command;
@@ -251,7 +251,6 @@ void ffPrepareWeather(FFinstance* instance);
void ffPrintCustom(FFinstance* instance, const char* key, const char* value);
void ffPrintBreak(FFinstance* instance);
void ffPrintBoard(FFinstance* instance);
void ffPrintChassis(FFinstance* instance);
void ffPrintUptime(FFinstance* instance);
void ffPrintProcesses(FFinstance* instance);
src/flashfetch.c
+1 -1
View File
@@ -25,7 +25,7 @@ int main(int argc, char** argv)
ffPrintOS(&instance, &instance.config.os);
ffPrintHost(&instance, &instance.config.host);
//ffPrintBios(&instance, &instance.config.bios);
//ffPrintBoard(&instance);
//ffPrintBoard(&instance, &instance.config.board);
//ffPrintChassis(&instance);
ffPrintKernel(&instance, &instance.config.kernel);
ffPrintUptime(&instance);
src/modules/board.c
-44
View File
@@ -1,44 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/board/board.h"
#define FF_BOARD_MODULE_NAME "Board"
#define FF_BOARD_NUM_FORMAT_ARGS 3
void ffPrintBoard(FFinstance* instance)
{
FFBoardResult result;
ffDetectBoard(&result);
if(result.error.length > 0)
{
ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board, "%*s", result.error.length, result.error.chars);
goto exit;
}
if(result.boardName.length == 0)
{
ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board, "board_name is not set.");
goto exit;
}
if(instance->config.board.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board.key);
puts(result.boardName.chars);
}
else
{
ffPrintFormat(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board, FF_BOARD_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVendor},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVersion},
});
}
exit:
ffStrbufDestroy(&result.boardName);
ffStrbufDestroy(&result.boardVendor);
ffStrbufDestroy(&result.boardVersion);
ffStrbufDestroy(&result.error);
}
src/modules/board/board.c
+97
View File
@@ -0,0 +1,97 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/board/board.h"
#include "modules/board/board.h"
#define FF_BOARD_MODULE_NAME "Board"
#define FF_BOARD_NUM_FORMAT_ARGS 3
void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
{
FFBoardResult result;
ffDetectBoard(&result);
if(result.error.length > 0)
{
ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "%*s", result.error.length, result.error.chars);
goto exit;
}
if(result.boardName.length == 0)
{
ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "board_name is not set.");
goto exit;
}
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs.key);
puts(result.boardName.chars);
}
else
{
ffPrintFormat(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_BOARD_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVendor},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVersion},
});
}
exit:
ffStrbufDestroy(&result.boardName);
ffStrbufDestroy(&result.boardVendor);
ffStrbufDestroy(&result.boardVersion);
ffStrbufDestroy(&result.error);
}
void ffInitBoardOptions(FFBoardOptions* options)
{
options->moduleName = FF_BOARD_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
}
bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_BOARD_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
return false;
}
void ffDestroyBoardOptions(FFBoardOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
bool ffParseBoardJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
{
if (strcasecmp(type, FF_BOARD_MODULE_NAME) != 0)
return false;
FFBoardOptions __attribute__((__cleanup__(ffDestroyBoardOptions))) options;
ffInitBoardOptions(&options);
if (module)
{
struct lh_entry* entry;
lh_foreach(data->ffjson_object_get_object(module), entry)
{
const char* key = (const char *)lh_entry_k(entry);
if (strcasecmp(key, "type") == 0)
continue;
json_object* val = (struct json_object *)lh_entry_v(entry);
if (ffJsonConfigParseModuleArgs(data, key, val, &options.moduleArgs))
continue;
ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintBoard(instance, &options);
return true;
}
#endif
src/modules/board/board.h
+13
View File
@@ -0,0 +1,13 @@
#pragma once
#include "fastfetch.h"
void ffPrintBoard(FFinstance* instance, FFBoardOptions* options);
void ffInitBoardOptions(FFBoardOptions* options);
bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const char* value);
void ffDestroyBoardOptions(FFBoardOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/config.h"
bool ffParseBoardJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module);
#endif
src/modules/board/option.h
+11
View File
@@ -0,0 +1,11 @@
#pragma once
// This file will be included in "fastfetch.h", do NOT put unnecessary things here
#include "common/option.h"
typedef struct FFBoardOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
} FFBoardOptions;
src/modules/jsonconfig/jsonconfig.c
+1
View File
@@ -16,6 +16,7 @@ static inline bool parseModuleJsonObject(FFinstance* instance, const char* type,
ffParseBatteryJsonObject(instance, type, data, module) ||
ffParseBiosJsonObject(instance, type, data, module) ||
ffParseBluetoothJsonObject(instance, type, data, module) ||
ffParseBoardJsonObject(instance, type, data, module) ||
ffParseCommandJsonObject(instance, type, data, module) ||
ffParseDateTimeJsonObject(instance, type, data, module) ||
ffParseDisplayJsonObject(instance, type, data, module) ||
src/modules/modules.h
+1
View File
@@ -6,6 +6,7 @@
#include "modules/battery/battery.h"
#include "modules/bios/bios.h"
#include "modules/bluetooth/bluetooth.h"
#include "modules/board/board.h"
#include "modules/command/command.h"
#include "modules/datetime/datetime.h"
#include "modules/display/display.h"
src/modules/options.h
+1
View File
@@ -5,6 +5,7 @@
#include "modules/battery/option.h"
#include "modules/bios/option.h"
#include "modules/bluetooth/option.h"
#include "modules/board/option.h"
#include "modules/command/option.h"
#include "modules/datetime/option.h"
#include "modules/display/option.h"