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

Packages: support JSON config

Browse Source
This commit is contained in:
李通洲
2023-05-26 14:32:27 +08:00
committed by 李通洲
parent 2f5c198a81
commit fa28529308
11 changed files with 92 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -290,7 +290,7 @@ set(LIBFASTFETCH_SRC
src/modules/opencl.c
src/modules/opengl.c
src/modules/os/os.c
src/modules/packages.c
src/modules/packages/packages.c
src/modules/player.c
src/modules/poweradapter.c
src/modules/processes.c
src/common/init.c
+2 -2
View File
@@ -69,7 +69,7 @@ static void defaultConfig(FFinstance* instance)
ffInitKernelOptions(&instance->config.kernel);
ffInitUptimeOptions(&instance->config.uptime);
initModuleArg(&instance->config.processes);
initModuleArg(&instance->config.packages);
ffInitPackagesOptions(&instance->config.packages);
initModuleArg(&instance->config.shell);
ffInitDisplayOptions(&instance->config.display);
initModuleArg(&instance->config.de);
@@ -291,7 +291,7 @@ static void destroyConfig(FFinstance* instance)
ffDestroyKernelOptions(&instance->config.kernel);
ffDestroyUptimeOptions(&instance->config.uptime);
destroyModuleArg(&instance->config.processes);
destroyModuleArg(&instance->config.packages);
ffDestroyPackagesOptions(&instance->config.packages);
destroyModuleArg(&instance->config.shell);
ffDestroyDisplayOptions(&instance->config.display);
destroyModuleArg(&instance->config.de);
src/fastfetch.c
+3 -3
View File
@@ -984,7 +984,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(ffParseKernelCommandOptions(&instance->config.kernel, key, value)) {}
else if(ffParseUptimeCommandOptions(&instance->config.uptime, key, value)) {}
else if(optionParseModuleArgs(key, value, "processes", &instance->config.processes)) {}
else if(optionParseModuleArgs(key, value, "packages", &instance->config.packages)) {}
else if(ffParsePackagesCommandOptions(&instance->config.packages, key, value)) {}
else if(optionParseModuleArgs(key, value, "shell", &instance->config.shell)) {}
else if(ffParseDisplayCommandOptions(&instance->config.display, key, value)) {}
else if(ffParseBrightnessCommandOptions(&instance->config.brightness, key, value)) {}
@@ -1190,8 +1190,8 @@ static void parseStructureCommand(FFinstance* instance, const char* line)
ffPrintProcesses(instance);
else if(strcasecmp(line, FF_UPTIME_MODULE_NAME) == 0)
ffPrintUptime(instance, &instance->config.uptime);
else if(strcasecmp(line, "packages") == 0)
ffPrintPackages(instance);
else if(strcasecmp(line, FF_PACKAGES_MODULE_NAME) == 0)
ffPrintPackages(instance, &instance->config.packages);
else if(strcasecmp(line, "shell") == 0)
ffPrintShell(instance);
else if(strcasecmp(line, FF_DISPLAY_MODULE_NAME) == 0)
src/fastfetch.h
+1 -2
View File
@@ -67,7 +67,7 @@ typedef struct FFconfig
FFKernelOptions kernel;
FFUptimeOptions uptime;
FFModuleArgs processes;
FFModuleArgs packages;
FFPackagesOptions packages;
FFModuleArgs shell;
FFDisplayOptions display;
FFModuleArgs de;
@@ -201,7 +201,6 @@ void ffPrepareWeather(FFinstance* instance);
void ffPrintChassis(FFinstance* instance);
void ffPrintProcesses(FFinstance* instance);
void ffPrintPackages(FFinstance* instance);
void ffPrintShell(FFinstance* instance);
void ffPrintDesktopEnvironment(FFinstance* instance);
void ffPrintWM(FFinstance* instance);
src/flashfetch.c
+1 -1
View File
@@ -30,7 +30,7 @@ int main(int argc, char** argv)
ffPrintKernel(&instance, &instance.config.kernel);
//ffPrintProcesses(&instance);
ffPrintUptime(&instance, &instance.config.uptime);
ffPrintPackages(&instance);
ffPrintPackages(&instance, &instance.config.packages);
ffPrintShell(&instance);
ffPrintDisplay(&instance, &instance.config.display);
// ffPrintBrightness(&instance);
src/modules/jsonconfig/jsonconfig.c
+6
View File
@@ -100,6 +100,12 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
false;
}
case 'P': {
return
tryModule(instance, type, module, FF_PACKAGES_MODULE_NAME, ffParsePackagesJsonObject) ||
false;
}
case 'S': {
return
tryModule(instance, type, module, FF_SEPARATOR_MODULE_NAME, ffParseSeparatorJsonObject) ||
src/modules/modules.h
+2 -1
View File
@@ -2,7 +2,6 @@
// For "fastfetch.c" and "flashfetch.c"
#include "modules/os/os.h"
#include "modules/battery/battery.h"
#include "modules/bios/bios.h"
#include "modules/bluetooth/bluetooth.h"
@@ -26,6 +25,8 @@
#include "modules/locale/locale.h"
#include "modules/localip/localip.h"
#include "modules/memory/memory.h"
#include "modules/os/os.h"
#include "modules/packages/packages.h"
#include "modules/separator/separator.h"
#include "modules/sound/sound.h"
#include "modules/swap/swap.h"
src/modules/options.h
+1
View File
@@ -24,6 +24,7 @@
#include "modules/localip/option.h"
#include "modules/memory/option.h"
#include "modules/os/option.h"
#include "modules/packages/option.h"
#include "modules/separator/option.h"
#include "modules/sound/option.h"
#include "modules/swap/option.h"
src/modules/packages/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 FFPackagesOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
} FFPackagesOptions;
src/modules/packages.c → src/modules/packages/packages.c
+48 -6
View File
@@ -1,24 +1,24 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/packages/packages.h"
#include "modules/packages/packages.h"
#define FF_PACKAGES_MODULE_NAME "Packages"
#define FF_PACKAGES_NUM_FORMAT_ARGS 21
void ffPrintPackages(FFinstance* instance)
void ffPrintPackages(FFinstance* instance, FFPackagesOptions* options)
{
const FFPackagesResult* counts = ffDetectPackages(instance);
uint32_t all = counts->all; //Copy it, so we can substract from it in FF_PRINT_PACKAGE
if(all == 0)
{
ffPrintError(instance, FF_PACKAGES_MODULE_NAME, 0, &instance->config.packages, "No packages from known package managers found");
ffPrintError(instance, FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, "No packages from known package managers found");
return;
}
if(instance->config.packages.outputFormat.length == 0)
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_PACKAGES_MODULE_NAME, 0, &instance->config.packages.key);
ffPrintLogoAndKey(instance, FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs.key);
#define FF_PRINT_PACKAGE_NAME(var, name) \
if(counts->var > 0) \
@@ -65,7 +65,7 @@ void ffPrintPackages(FFinstance* instance)
}
else
{
ffPrintFormat(instance, FF_PACKAGES_MODULE_NAME, 0, &instance->config.packages, FF_PACKAGES_NUM_FORMAT_ARGS, (FFformatarg[]){
ffPrintFormat(instance, FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PACKAGES_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_UINT, &all},
{FF_FORMAT_ARG_TYPE_UINT, &counts->pacman},
{FF_FORMAT_ARG_TYPE_STRBUF, &counts->pacmanBranch},
@@ -90,3 +90,45 @@ void ffPrintPackages(FFinstance* instance)
});
}
}
void ffInitPackagesOptions(FFPackagesOptions* options)
{
options->moduleName = FF_PACKAGES_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
}
bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_PACKAGES_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
return false;
}
void ffDestroyPackagesOptions(FFPackagesOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
void ffParsePackagesJsonObject(FFinstance* instance, json_object* module)
{
FFPackagesOptions __attribute__((__cleanup__(ffDestroyPackagesOptions))) options;
ffInitPackagesOptions(&options);
if (module)
{
json_object_object_foreach(module, key, val)
{
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
ffPrintError(instance, FF_PACKAGES_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintPackages(instance, &options);
}
#endif
src/modules/packages/packages.h
+16
View File
@@ -0,0 +1,16 @@
#pragma once
#include "fastfetch.h"
#include "modules/packages/option.h"
#define FF_PACKAGES_MODULE_NAME "Packages"
void ffPrintPackages(FFinstance* instance, FFPackagesOptions* options);
void ffInitPackagesOptions(FFPackagesOptions* options);
bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key, const char* value);
void ffDestroyPackagesOptions(FFPackagesOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
void ffParsePackagesJsonObject(FFinstance* instance, json_object* module);
#endif