fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-30 17:41:41 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Shell: add JSON config support

Browse Source
This commit is contained in:
李通洲
2023-06-01 11:37:52 +08:00
committed by 李通洲
parent fa28529308
commit 786d538276
14 changed files with 140 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/init.c
+2 -3
View File
@@ -70,7 +70,7 @@ static void defaultConfig(FFinstance* instance)
ffInitUptimeOptions(&instance->config.uptime);
initModuleArg(&instance->config.processes);
ffInitPackagesOptions(&instance->config.packages);
initModuleArg(&instance->config.shell);
ffInitShellOptions(&instance->config.shell);
ffInitDisplayOptions(&instance->config.display);
initModuleArg(&instance->config.de);
initModuleArg(&instance->config.wm);
@@ -133,7 +133,6 @@ static void defaultConfig(FFinstance* instance)
ffStrbufInit(&instance->config.libwlanapi);
ffStrbufInit(&instance->config.libnm);
instance->config.shellVersion = true;
instance->config.terminalVersion = true;
instance->config.publicIpTimeout = 0;
@@ -292,7 +291,7 @@ static void destroyConfig(FFinstance* instance)
ffDestroyUptimeOptions(&instance->config.uptime);
destroyModuleArg(&instance->config.processes);
ffDestroyPackagesOptions(&instance->config.packages);
destroyModuleArg(&instance->config.shell);
ffDestroyShellOptions(&instance->config.shell);
ffDestroyDisplayOptions(&instance->config.display);
destroyModuleArg(&instance->config.de);
destroyModuleArg(&instance->config.wm);
src/detection/terminalshell/terminalshell_linux.c
+1 -1
View File
@@ -353,7 +353,7 @@ const FFTerminalShellResult* ffDetectTerminalShell(const FFinstance* instance)
getUserShellFromEnv(instance, &result);
ffStrbufClear(&result.shellVersion);
if(instance->config.shellVersion)
if(instance->config.shell.version)
{
getShellVersion(&result.shellExe, result.shellExeName, &result.shellVersion);
src/detection/terminalshell/terminalshell_windows.c
+1 -1
View File
@@ -152,7 +152,7 @@ static uint32_t getShellInfo(const FFinstance* instance, FFTerminalShellResult*
}
ffStrbufClear(&result->shellVersion);
if(instance->config.shellVersion)
if(instance->config.shell.version)
fftsGetShellVersion(&result->shellExe, result->shellPrettyName.chars, &result->shellVersion);
result->shellPid = pid;
src/fastfetch.c
+3 -5
View File
@@ -985,7 +985,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(ffParseUptimeCommandOptions(&instance->config.uptime, key, value)) {}
else if(optionParseModuleArgs(key, value, "processes", &instance->config.processes)) {}
else if(ffParsePackagesCommandOptions(&instance->config.packages, key, value)) {}
else if(optionParseModuleArgs(key, value, "shell", &instance->config.shell)) {}
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)) {}
@@ -1088,8 +1088,6 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
//Module options//
//////////////////
else if(strcasecmp(key, "--shell-version") == 0)
instance->config.shellVersion = optionParseBoolean(value);
else if(strcasecmp(key, "--terminal-version") == 0)
instance->config.terminalVersion = optionParseBoolean(value);
else if(strcasecmp(key, "--player-name") == 0)
@@ -1192,8 +1190,8 @@ static void parseStructureCommand(FFinstance* instance, const char* line)
ffPrintUptime(instance, &instance->config.uptime);
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_SHELL_MODULE_NAME) == 0)
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)
src/fastfetch.h
+1 -3
View File
@@ -68,7 +68,7 @@ typedef struct FFconfig
FFUptimeOptions uptime;
FFModuleArgs processes;
FFPackagesOptions packages;
FFModuleArgs shell;
FFShellOptions shell;
FFDisplayOptions display;
FFModuleArgs de;
FFModuleArgs wallpaper;
@@ -132,7 +132,6 @@ typedef struct FFconfig
FFstrbuf libwlanapi;
FFstrbuf libnm;
bool shellVersion;
bool terminalVersion;
FFstrbuf publicIpUrl;
@@ -201,7 +200,6 @@ void ffPrepareWeather(FFinstance* instance);
void ffPrintChassis(FFinstance* instance);
void ffPrintProcesses(FFinstance* instance);
void ffPrintShell(FFinstance* instance);
void ffPrintDesktopEnvironment(FFinstance* instance);
void ffPrintWM(FFinstance* instance);
void ffPrintTheme(FFinstance* instance);
src/flashfetch.c
+1 -1
View File
@@ -31,7 +31,7 @@ int main(int argc, char** argv)
//ffPrintProcesses(&instance);
ffPrintUptime(&instance, &instance.config.uptime);
ffPrintPackages(&instance, &instance.config.packages);
ffPrintShell(&instance);
ffPrintShell(&instance, &instance.config.shell);
ffPrintDisplay(&instance, &instance.config.display);
// ffPrintBrightness(&instance);
ffPrintDesktopEnvironment(&instance);
src/modules/jsonconfig/jsonconfig.c
+1
View File
@@ -109,6 +109,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
case 'S': {
return
tryModule(instance, type, module, FF_SEPARATOR_MODULE_NAME, ffParseSeparatorJsonObject) ||
tryModule(instance, type, module, FF_SHELL_MODULE_NAME, ffParseShellJsonObject) ||
tryModule(instance, type, module, FF_SOUND_MODULE_NAME, ffParseSoundJsonObject) ||
tryModule(instance, type, module, FF_SWAP_MODULE_NAME, ffParseSwapJsonObject) ||
false;
src/modules/modules.h
+1
View File
@@ -28,6 +28,7 @@
#include "modules/os/os.h"
#include "modules/packages/packages.h"
#include "modules/separator/separator.h"
#include "modules/shell/shell.h"
#include "modules/sound/sound.h"
#include "modules/swap/swap.h"
#include "modules/title/title.h"
src/modules/options.h
+1
View File
@@ -26,6 +26,7 @@
#include "modules/os/option.h"
#include "modules/packages/option.h"
#include "modules/separator/option.h"
#include "modules/shell/option.h"
#include "modules/sound/option.h"
#include "modules/swap/option.h"
#include "modules/title/option.h"
src/modules/shell.c
-43
View File
@@ -1,43 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/terminalshell/terminalshell.h"
#define FF_SHELL_MODULE_NAME "Shell"
#define FF_SHELL_NUM_FORMAT_ARGS 7
void ffPrintShell(FFinstance* instance)
{
const FFTerminalShellResult* result = ffDetectTerminalShell(instance);
if(result->shellProcessName.length == 0)
{
ffPrintError(instance, FF_SHELL_MODULE_NAME, 0, &instance->config.shell, "Couldn't detect shell");
return;
}
if(instance->config.shell.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_SHELL_MODULE_NAME, 0, &instance->config.shell.key);
ffStrbufWriteTo(&result->shellPrettyName, stdout);
if(result->shellVersion.length > 0)
{
putchar(' ');
ffStrbufWriteTo(&result->shellVersion, stdout);
}
putchar('\n');
}
else
{
ffPrintFormat(instance, FF_SHELL_MODULE_NAME, 0, &instance->config.shell, FF_SHELL_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellExe},
{FF_FORMAT_ARG_TYPE_STRING, result->shellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellVersion},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellExe},
{FF_FORMAT_ARG_TYPE_STRING, result->userShellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellVersion}
});
}
}
src/modules/shell/option.h
+13
View File
@@ -0,0 +1,13 @@
#pragma once
// This file will be included in "fastfetch.h", do NOT put unnecessary things here
#include "common/option.h"
typedef struct FFShellOptions
{
const char* moduleName;
FFModuleArgs moduleArgs;
bool version;
} FFShellOptions;
src/modules/shell/shell.c
+99
View File
@@ -0,0 +1,99 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "detection/terminalshell/terminalshell.h"
#include "modules/shell/shell.h"
#define FF_SHELL_NUM_FORMAT_ARGS 7
void ffPrintShell(FFinstance* instance, FFShellOptions* options)
{
const FFTerminalShellResult* result = ffDetectTerminalShell(instance);
if(result->shellProcessName.length == 0)
{
ffPrintError(instance, FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, "Couldn't detect shell");
return;
}
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_SHELL_MODULE_NAME, 0, &options->moduleArgs.key);
ffStrbufWriteTo(&result->shellPrettyName, stdout);
if(result->shellVersion.length > 0)
{
putchar(' ');
ffStrbufWriteTo(&result->shellVersion, stdout);
}
putchar('\n');
}
else
{
ffPrintFormat(instance, FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, FF_SHELL_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellExe},
{FF_FORMAT_ARG_TYPE_STRING, result->shellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellVersion},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellExe},
{FF_FORMAT_ARG_TYPE_STRING, result->userShellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellVersion}
});
}
}
void ffInitShellOptions(FFShellOptions* options)
{
options->moduleName = FF_SHELL_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
options->version = true;
}
bool ffParseShellCommandOptions(FFShellOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_SHELL_MODULE_NAME);
if (!subKey) return false;
if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
return true;
if (strcasecmp(subKey, "version") == 0)
{
options->version = ffOptionParseBoolean(value);
return true;
}
return false;
}
void ffDestroyShellOptions(FFShellOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
}
#ifdef FF_HAVE_JSONC
void ffParseShellJsonObject(FFinstance* instance, json_object* module)
{
FFShellOptions __attribute__((__cleanup__(ffDestroyShellOptions))) options;
ffInitShellOptions(&options);
if (module)
{
json_object_object_foreach(module, key, val)
{
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
continue;
if (strcasecmp(key, "version") == 0)
{
options.version = (bool) json_object_get_boolean(val);
continue;
}
ffPrintError(instance, FF_SHELL_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintShell(instance, &options);
}
#endif
src/modules/shell/shell.h
+15
View File
@@ -0,0 +1,15 @@
#pragma once
#include "fastfetch.h"
#define FF_SHELL_MODULE_NAME "Shell"
void ffPrintShell(FFinstance* instance, FFShellOptions* options);
void ffInitShellOptions(FFShellOptions* options);
bool ffParseShellCommandOptions(FFShellOptions* options, const char* key, const char* value);
void ffDestroyShellOptions(FFShellOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/jsonconfig.h"
void ffParseShellJsonObject(FFinstance* instance, json_object* module);
#endif