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

DE: support JSON config

Browse Source
This commit is contained in:
李通洲
2023-06-07 10:39:53 +08:00
committed by 李通洲
parent 54a1890aca
commit 11d8142cea
12 changed files with 119 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -276,7 +276,7 @@ set(LIBFASTFETCH_SRC
src/modules/custom/custom.c
src/modules/command/command.c
src/modules/datetime/datetime.c
src/modules/de.c
src/modules/de/de.c
src/modules/disk/disk.c
src/modules/font/font.c
src/modules/gpu/gpu.c
src/common/init.c
+2 -2
View File
@@ -72,7 +72,7 @@ static void defaultConfig(FFinstance* instance)
ffInitPackagesOptions(&instance->config.packages);
ffInitShellOptions(&instance->config.shell);
ffInitDisplayOptions(&instance->config.display);
initModuleArg(&instance->config.de);
ffInitDEOptions(&instance->config.de);
initModuleArg(&instance->config.wm);
ffInitWMThemeOptions(&instance->config.wmTheme);
initModuleArg(&instance->config.theme);
@@ -291,7 +291,7 @@ static void destroyConfig(FFinstance* instance)
ffDestroyPackagesOptions(&instance->config.packages);
ffDestroyShellOptions(&instance->config.shell);
ffDestroyDisplayOptions(&instance->config.display);
destroyModuleArg(&instance->config.de);
ffDestroyDEOptions(&instance->config.de);
destroyModuleArg(&instance->config.wm);
ffDestroyWMThemeOptions(&instance->config.wmTheme);
destroyModuleArg(&instance->config.theme);
src/fastfetch.c
+3 -3
View File
@@ -988,7 +988,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(ffParseShellCommandOptions(&instance->config.shell, key, value)) {}
else if(ffParseDisplayCommandOptions(&instance->config.display, key, value)) {}
else if(ffParseBrightnessCommandOptions(&instance->config.brightness, key, value)) {}
else if(optionParseModuleArgs(key, value, "de", &instance->config.de)) {}
else if(ffParseDECommandOptions(&instance->config.de, key, value)) {}
else if(ffParseWifiCommandOptions(&instance->config.wifi, key, value)) {}
else if(optionParseModuleArgs(key, value, "wm", &instance->config.wm)) {}
else if(ffParseWMThemeCommandOptions(&instance->config.wmTheme, key, value)) {}
@@ -1192,8 +1192,8 @@ static void parseStructureCommand(FFinstance* instance, const char* line)
ffPrintShell(instance, &instance->config.shell);
else if(strcasecmp(line, FF_DISPLAY_MODULE_NAME) == 0)
ffPrintDisplay(instance, &instance->config.display);
else if(strcasecmp(line, "desktopenvironment") == 0 || strcasecmp(line, "de") == 0)
ffPrintDesktopEnvironment(instance);
else if(strcasecmp(line, FF_DE_MODULE_NAME) == 0)
ffPrintDE(instance, &instance->config.de);
else if(strcasecmp(line, "windowmanager") == 0 || strcasecmp(line, "wm") == 0)
ffPrintWM(instance);
else if(strcasecmp(line, "theme") == 0)
src/fastfetch.h
+1 -2
View File
@@ -70,7 +70,7 @@ typedef struct FFconfig
FFPackagesOptions packages;
FFShellOptions shell;
FFDisplayOptions display;
FFModuleArgs de;
FFDEOptions de;
FFWallpaperOptions wallpaper;
FFWifiOptions wifi;
FFModuleArgs wm;
@@ -198,7 +198,6 @@ void ffPrepareWeather(FFinstance* instance);
void ffPrintChassis(FFinstance* instance);
void ffPrintProcesses(FFinstance* instance);
void ffPrintDesktopEnvironment(FFinstance* instance);
void ffPrintWM(FFinstance* instance);
void ffPrintTheme(FFinstance* instance);
void ffPrintPlayer(FFinstance* instance);
src/flashfetch.c
+1 -1
View File
@@ -34,7 +34,7 @@ int main(int argc, char** argv)
ffPrintShell(&instance, &instance.config.shell);
ffPrintDisplay(&instance, &instance.config.display);
// ffPrintBrightness(&instance);
ffPrintDesktopEnvironment(&instance);
ffPrintDE(&instance, &instance.config.de);
ffPrintWM(&instance);
ffPrintWMTheme(&instance, &instance.config.wmTheme);
ffPrintTheme(&instance);
src/modules/de.c
-45
View File
@@ -1,45 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/displayserver/displayserver.h"
#define FF_DE_MODULE_NAME "DE"
#define FF_DE_NUM_FORMAT_ARGS 3
void ffPrintDesktopEnvironment(FFinstance* instance)
{
#ifdef __ANDROID__
ffPrintError(instance, FF_DE_MODULE_NAME, 0, &instance->config.de, "DE detection is not supported on Android");
return;
#endif
const FFDisplayServerResult* result = ffConnectDisplayServer(instance);
if(result->dePrettyName.length == 0)
{
ffPrintError(instance, FF_DE_MODULE_NAME, 0, &instance->config.de, "No DE found");
return;
}
if(instance->config.de.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_DE_MODULE_NAME, 0, &instance->config.de.key);
ffStrbufWriteTo(&result->dePrettyName, stdout);
if(result->deVersion.length > 0)
{
putchar(' ');
ffStrbufWriteTo(&result->deVersion, stdout);
}
putchar('\n');
}
else
{
ffPrintFormat(instance, FF_DE_MODULE_NAME, 0, &instance->config.de, FF_DE_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &result->deProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->dePrettyName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->deVersion}
});
}
}
src/modules/de/de.c
+82
View File
@@ -0,0 +1,82 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/displayserver/displayserver.h"
#include "modules/de/de.h"
#define FF_DE_NUM_FORMAT_ARGS 3
void ffPrintDE(FFinstance* instance, FFDEOptions* options)
{
const FFDisplayServerResult* result = ffConnectDisplayServer(instance);
if(result->dePrettyName.length == 0)
{
ffPrintError(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs, "No DE found");
return;
}
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs.key);
ffStrbufWriteTo(&result->dePrettyName, stdout);
if(result->deVersion.length > 0)
{
putchar(' ');
ffStrbufWriteTo(&result->deVersion, stdout);
}
putchar('\n');
}
else
{
ffPrintFormat(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_DE_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &result->deProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->dePrettyName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->deVersion}
});
}
}
void ffInitDEOptions(FFDEOptions* options)
{
options->moduleName = FF_DE_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
}
bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_DE_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
return false;
}
void ffDestroyDEOptions(FFDEOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
void ffParseDEJsonObject(FFinstance* instance, json_object* module)
{
FFDEOptions __attribute__((__cleanup__(ffDestroyDEOptions))) options;
ffInitDEOptions(&options);
if (module)
{
json_object_object_foreach(module, key, val)
{
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
ffPrintError(instance, FF_DE_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintDE(instance, &options);
}
#endif
src/modules/de/de.h
+15
View File
@@ -0,0 +1,15 @@
#pragma once
#include "fastfetch.h"
#define FF_DE_MODULE_NAME "DE"
void ffPrintDE(FFinstance* instance, FFDEOptions* options);
void ffInitDEOptions(FFDEOptions* options);
bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* value);
void ffDestroyDEOptions(FFDEOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
void ffParseDEJsonObject(FFinstance* instance, json_object* module);
#endif
src/modules/de/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 FFDEOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
} FFDEOptions;
src/modules/jsonconfig/jsonconfig.c
+1
View File
@@ -53,6 +53,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
tryModule(instance, type, module, FF_DATETIME_MODULE_NAME, ffParseDateTimeJsonObject) ||
tryModule(instance, type, module, FF_DISPLAY_MODULE_NAME, ffParseDisplayJsonObject) ||
tryModule(instance, type, module, FF_DISK_MODULE_NAME, ffParseDiskJsonObject) ||
tryModule(instance, type, module, FF_DE_MODULE_NAME, ffParseDEJsonObject) ||
false;
}
src/modules/modules.h
+1
View File
@@ -17,6 +17,7 @@
#include "modules/datetime/datetime.h"
#include "modules/disk/disk.h"
#include "modules/display/display.h"
#include "modules/de/de.h"
#include "modules/font/font.h"
#include "modules/gamepad/gamepad.h"
#include "modules/gpu/gpu.h"
src/modules/options.h
+1
View File
@@ -13,6 +13,7 @@
#include "modules/custom/option.h"
#include "modules/command/option.h"
#include "modules/datetime/option.h"
#include "modules/de/option.h"
#include "modules/disk/option.h"
#include "modules/display/option.h"
#include "modules/font/option.h"