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

Kernel: support JSON config

Browse Source
This commit is contained in:
李通洲
2023-03-10 14:14:32 +08:00
parent 9c066e9494
commit 169785a8bb
12 changed files with 118 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -281,7 +281,7 @@ set(LIBFASTFETCH_SRC
src/modules/host/host.c
src/modules/icons.c
src/modules/gamepad.c
src/modules/kernel.c
src/modules/kernel/kernel.c
src/modules/locale.c
src/modules/localip.c
src/modules/memory.c
src/common/init.c
+2 -2
View File
@@ -80,7 +80,7 @@ static void defaultConfig(FFinstance* instance)
initModuleArg(&instance->config.brightness);
initModuleArg(&instance->config.chassis);
ffInitCommandOptions(&instance->config.command);
initModuleArg(&instance->config.kernel);
ffInitKernelOptions(&instance->config.kernel);
initModuleArg(&instance->config.uptime);
initModuleArg(&instance->config.processes);
initModuleArg(&instance->config.packages);
@@ -319,7 +319,7 @@ static void destroyConfig(FFinstance* instance)
destroyModuleArg(&instance->config.board);
destroyModuleArg(&instance->config.chassis);
ffDestroyCommandOptions(&instance->config.command);
destroyModuleArg(&instance->config.kernel);
ffDestroyKernelOptions(&instance->config.kernel);
destroyModuleArg(&instance->config.uptime);
destroyModuleArg(&instance->config.processes);
destroyModuleArg(&instance->config.packages);
src/fastfetch.c
+2 -2
View File
@@ -1139,7 +1139,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(optionParseModuleArgs(key, value, "board", &instance->config.board)) {}
else if(optionParseModuleArgs(key, value, "chassis", &instance->config.chassis)) {}
else if(ffParseCommandCommandOptions(&instance->config.command, key, value)) {}
else if(optionParseModuleArgs(key, value, "kernel", &instance->config.kernel)) {}
else if(ffParseKernelCommandOptions(&instance->config.kernel, key, value)) {}
else if(optionParseModuleArgs(key, value, "uptime", &instance->config.uptime)) {}
else if(optionParseModuleArgs(key, value, "processes", &instance->config.processes)) {}
else if(optionParseModuleArgs(key, value, "packages", &instance->config.packages)) {}
@@ -1395,7 +1395,7 @@ static void parseStructureCommand(FFinstance* instance, FFdata* data, const char
else if(strcasecmp(line, "chassis") == 0)
ffPrintChassis(instance);
else if(strcasecmp(line, "kernel") == 0)
ffPrintKernel(instance);
ffPrintKernel(instance, &instance->config.kernel);
else if(strcasecmp(line, "uptime") == 0)
ffPrintUptime(instance);
else if(strcasecmp(line, "processes") == 0)
src/fastfetch.h
+1 -2
View File
@@ -134,7 +134,7 @@ typedef struct FFconfig
FFModuleArgs brightness;
FFModuleArgs chassis;
FFCommandOptions command;
FFModuleArgs kernel;
FFKernelOptions kernel;
FFModuleArgs uptime;
FFModuleArgs processes;
FFModuleArgs packages;
@@ -289,7 +289,6 @@ void ffPrintBreak(FFinstance* instance);
void ffPrintBios(FFinstance* instance);
void ffPrintBoard(FFinstance* instance);
void ffPrintChassis(FFinstance* instance);
void ffPrintKernel(FFinstance* instance);
void ffPrintUptime(FFinstance* instance);
void ffPrintProcesses(FFinstance* instance);
void ffPrintPackages(FFinstance* instance);
src/flashfetch.c
+1 -1
View File
@@ -27,7 +27,7 @@ int main(int argc, char** argv)
//ffPrintBios(&instance);
//ffPrintBoard(&instance);
//ffPrintChassis(&instance);
ffPrintKernel(&instance);
ffPrintKernel(&instance, &instance.config.kernel);
ffPrintUptime(&instance);
//ffPrintProcesses(&instance);
ffPrintPackages(&instance);
src/modules/jsonconfig/jsonconfig.c
+1
View File
@@ -18,6 +18,7 @@ static inline bool parseModuleJsonObject(FFinstance* instance, const char* type,
ffParseDateTimeJsonObject(instance, type, data, module) ||
ffParseDisplayJsonObject(instance, type, data, module) ||
ffParseHostJsonObject(instance, type, data, module) ||
ffParseKernelJsonObject(instance, type, data, module) ||
ffParseOSJsonObject(instance, type, data, module) ||
ffParseSeparatorJsonObject(instance, type, data, module) ||
false;
src/modules/kernel.c
-30
View File
@@ -1,30 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#define FF_KERNEL_MODULE_NAME "Kernel"
#define FF_KERNEL_NUM_FORMAT_ARGS 4
void ffPrintKernel(FFinstance* instance)
{
if(instance->config.kernel.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_KERNEL_MODULE_NAME, 0, &instance->config.kernel.key);
ffStrbufWriteTo(&instance->state.platform.systemRelease, stdout);
#ifdef _WIN32
if(instance->state.platform.systemVersion.length > 0)
printf(" (%s)", instance->state.platform.systemVersion.chars);
#endif
putchar('\n');
}
else
{
ffPrintFormat(instance, FF_KERNEL_MODULE_NAME, 0, &instance->config.kernel, FF_KERNEL_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemName},
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemRelease},
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemVersion},
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemArchitecture}
});
}
}
src/modules/kernel/kernel.c
+83
View File
@@ -0,0 +1,83 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "modules/kernel/kernel.h"
#define FF_KERNEL_MODULE_NAME "Kernel"
#define FF_KERNEL_NUM_FORMAT_ARGS 4
void ffPrintKernel(FFinstance* instance, FFKernelOptions* options)
{
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs.key);
ffStrbufWriteTo(&instance->state.platform.systemRelease, stdout);
#ifdef _WIN32
if(instance->state.platform.systemVersion.length > 0)
printf(" (%s)", instance->state.platform.systemVersion.chars);
#endif
putchar('\n');
}
else
{
ffPrintFormat(instance, FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs, FF_KERNEL_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemName},
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemRelease},
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemVersion},
{FF_FORMAT_ARG_TYPE_STRBUF, &instance->state.platform.systemArchitecture}
});
}
}
void ffInitKernelOptions(FFKernelOptions* options)
{
options->moduleName = FF_KERNEL_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
}
bool ffParseKernelCommandOptions(FFKernelOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_KERNEL_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
return false;
}
void ffDestroyKernelOptions(FFKernelOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
bool ffParseKernelJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
{
if (strcasecmp(type, FF_KERNEL_MODULE_NAME) != 0)
return false;
FFKernelOptions __attribute__((__cleanup__(ffDestroyKernelOptions))) options;
ffInitKernelOptions(&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_KERNEL_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintKernel(instance, &options);
return true;
}
#endif
src/modules/kernel/kernel.h
+14
View File
@@ -0,0 +1,14 @@
#pragma once
#include "fastfetch.h"
#include "modules/kernel/option.h"
void ffPrintKernel(FFinstance* instance, FFKernelOptions* options);
void ffInitKernelOptions(FFKernelOptions* options);
bool ffParseKernelCommandOptions(FFKernelOptions* options, const char* key, const char* value);
void ffDestroyKernelOptions(FFKernelOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/config.h"
bool ffParseKernelJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module);
#endif
src/modules/kernel/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 FFKernelOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
} FFKernelOptions;
src/modules/modules.h
+1
View File
@@ -8,6 +8,7 @@
#include "modules/datetime/datetime.h"
#include "modules/display/display.h"
#include "modules/host/host.h"
#include "modules/kernel/kernel.h"
#include "modules/separator/separator.h"
#include "modules/title/title.h"
#include "modules/jsonconfig/jsonconfig.h"
src/modules/options.h
+1
View File
@@ -7,6 +7,7 @@
#include "modules/datetime/option.h"
#include "modules/display/option.h"
#include "modules/host/option.h"
#include "modules/kernel/option.h"
#include "modules/os/option.h"
#include "modules/separator/option.h"
#include "modules/title/option.h"