malhuda/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2025-02-20 11:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Title: init support of JSON config

Browse Source
This commit is contained in:
李通洲 2023-03-09 18:11:03 +08:00
parent 0ab2eda0ae
commit da5da85c07
13 changed files with 141 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -304,7 +304,7 @@ set(LIBFASTFETCH_SRC
src/modules/terminalfont.c
src/modules/theme.c
src/modules/time.c
src/modules/title.c
src/modules/title/title.c
src/modules/uptime.c
src/modules/users.c
src/modules/vulkan.c

1
src/common/config.c
View File

@ -11,6 +11,7 @@
static inline bool parseModuleJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
{
return
ffParseTitleJsonObject(instance, type, data, module) ||
ffParseBatteryJsonObject(instance, type, data, module) ||
ffParseCommandJsonObject(instance, type, data, module) ||
ffParseOSJsonObject(instance, type, data, module) ||

5
src/common/init.c
View File

@ -22,6 +22,7 @@ static void initState(FFstate* state)
state->logoWidth = 0;
state->logoHeight = 0;
state->keysHeight = 0;
state->titleLength = 0;
ffPlatformInit(&state->platform);
}
@ -71,6 +72,7 @@ static void defaultConfig(FFinstance* instance)
instance->config.multithreading = true;
instance->config.stat = false;
ffInitTitleOptions(&instance->config.title);
ffInitOSOptions(&instance->config.os);
initModuleArg(&instance->config.host);
initModuleArg(&instance->config.bios);
@ -157,8 +159,6 @@ static void defaultConfig(FFinstance* instance)
instance->config.shellVersion = true;
instance->config.terminalVersion = true;
instance->config.titleFQDN = false;
ffStrbufInitA(&instance->config.diskFolders, 0);
instance->config.diskShowTypes = FF_DISK_TYPE_REGULAR_BIT | FF_DISK_TYPE_EXTERNAL_BIT;
@ -318,6 +318,7 @@ static void destroyConfig(FFinstance* instance)
ffStrbufDestroy(&instance->config.colorTitle);
ffStrbufDestroy(&instance->config.keyValueSeparator);
ffDestroyTitleOptions(&instance->config.title);
ffDestroyOSOptions(&instance->config.os);
destroyModuleArg(&instance->config.host);
destroyModuleArg(&instance->config.bios);

4
src/fastfetch.c
View File

@ -1258,8 +1258,6 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
instance->config.gpuHideIntegrated = optionParseBoolean(value);
else if(strcasecmp(key, "--gpu-hide-discrete") == 0)
instance->config.gpuHideDiscrete = optionParseBoolean(value);
else if(strcasecmp(key, "--title-fqdn") == 0)
instance->config.titleFQDN = optionParseBoolean(value);
else if(strcasecmp(key, "--shell-version") == 0)
instance->config.shellVersion = optionParseBoolean(value);
else if(strcasecmp(key, "--terminal-version") == 0)
@ -1395,7 +1393,7 @@ static void parseStructureCommand(FFinstance* instance, FFdata* data, const char
if(strcasecmp(line, "break") == 0)
ffPrintBreak(instance);
else if(strcasecmp(line, "title") == 0)
ffPrintTitle(instance);
ffPrintTitle(instance, &instance->config.title);
else if(strcasecmp(line, "separator") == 0)
ffPrintSeparator(instance, &instance->config.separator);
else if(strcasecmp(line, "os") == 0)

5
src/fastfetch.h
View File

@ -133,6 +133,7 @@ typedef struct FFconfig
bool multithreading;
bool stat;
FFTitleOptions title;
FFOSOptions os;
FFModuleArgs host;
FFModuleArgs bios;
@ -216,8 +217,6 @@ typedef struct FFconfig
bool gpuHideIntegrated;
bool gpuHideDiscrete;
bool titleFQDN;
bool shellVersion;
bool terminalVersion;
@ -251,6 +250,7 @@ typedef struct FFstate
uint32_t logoWidth;
uint32_t logoHeight;
uint32_t keysHeight;
uint32_t titleLength;
FFPlatform platform;
} FFstate;
@ -300,7 +300,6 @@ void ffPrepareWeather(FFinstance* instance);
void ffPrintCustom(FFinstance* instance, const char* key, const char* value);
void ffPrintBreak(FFinstance* instance);
void ffPrintTitle(FFinstance* instance);
void ffPrintHost(FFinstance* instance);
void ffPrintBios(FFinstance* instance);
void ffPrintBoard(FFinstance* instance);

2
src/flashfetch.c
View File

@ -20,7 +20,7 @@ int main(int argc, char** argv)
ffStart(&instance);
//Printing
ffPrintTitle(&instance);
ffPrintTitle(&instance, &instance.config.title);
ffPrintSeparator(&instance, &instance.config.separator);
ffPrintOS(&instance, &instance.config.os);
ffPrintHost(&instance);

1
src/modules/modules.h
View File

@ -6,3 +6,4 @@
#include "modules/battery/battery.h"
#include "modules/command/command.h"
#include "modules/separator/separator.h"
#include "modules/title/title.h"

1
src/modules/options.h
View File

@ -6,3 +6,4 @@
#include "modules/os/option.h"
#include "modules/command/option.h"
#include "modules/separator/option.h"
#include "modules/title/option.h"

13
src/modules/separator/separator.c
View File

@ -6,10 +6,15 @@
void ffPrintSeparator(FFinstance* instance, FFSeparatorOptions* options)
{
uint32_t titleLength = instance->state.platform.userName.length + 1 + (instance->config.titleFQDN ?
instance->state.platform.domainName.length :
instance->state.platform.hostName.length
);
uint32_t titleLength = instance->state.titleLength;
if (titleLength == 0)
{
// Title was not printed, should we support this case?
titleLength = instance->state.platform.userName.length + 1 + (instance->config.title.fdqn ?
instance->state.platform.domainName.length :
instance->state.platform.hostName.length
);
}
ffLogoPrintLine(instance);

30
src/modules/title.c
View File

@ -1,30 +0,0 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "util/textModifier.h"
static inline void printTitlePart(FFinstance* instance, const FFstrbuf* content)
{
if(!instance->config.pipe)
{
fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
ffPrintColor(&instance->config.colorTitle);
}
ffStrbufWriteTo(content, stdout);
if(!instance->config.pipe)
fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
}
void ffPrintTitle(FFinstance* instance)
{
ffLogoPrintLine(instance);
printTitlePart(instance, &instance->state.platform.userName);
putchar('@');
printTitlePart(instance, instance->config.titleFQDN ?
&instance->state.platform.domainName :
&instance->state.platform.hostName
);
putchar('\n');
}

12
src/modules/title/option.h Normal file
View File

@ -0,0 +1,12 @@
#pragma once
// This file will be included in "fastfetch.h", do NOT put unnecessary things here
#include "common/option.h"
typedef struct FFTitleOptions
{
const char* moduleName;
bool fdqn;
} FFTitleOptions;

95
src/modules/title/title.c Normal file
View File

@ -0,0 +1,95 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "util/textModifier.h"
#include "modules/title/title.h"
#define FF_TITLE_MODULE_NAME "Title"
static inline void printTitlePart(FFinstance* instance, const FFstrbuf* content)
{
if(!instance->config.pipe)
{
fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
ffPrintColor(&instance->config.colorTitle);
}
ffStrbufWriteTo(content, stdout);
if(!instance->config.pipe)
fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
}
void ffPrintTitle(FFinstance* instance, FFTitleOptions* options)
{
ffLogoPrintLine(instance);
printTitlePart(instance, &instance->state.platform.userName);
putchar('@');
FFstrbuf* host = options->fdqn ?
&instance->state.platform.domainName :
&instance->state.platform.hostName;
printTitlePart(instance, host);
instance->state.titleLength = instance->state.platform.userName.length + host->length + 1;
putchar('\n');
}
void ffInitTitleOptions(FFTitleOptions* options)
{
options->moduleName = FF_TITLE_MODULE_NAME;
options->fdqn = false;
}
bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const char* value)
{
const char* subKey = ffOptionTestPrefix(key, FF_TITLE_MODULE_NAME);
if (!subKey) return false;
if (strcasecmp(subKey, "fdqn") == 0)
{
options->fdqn = ffOptionParseBoolean(value);
return true;
}
return false;
}
void ffDestroyTitleOptions(FFTitleOptions* options)
{
FF_UNUSED(options);
}
#ifdef FF_HAVE_JSONC
bool ffParseTitleJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
{
if (strcasecmp(type, FF_TITLE_MODULE_NAME) != 0)
return false;
FFTitleOptions __attribute__((__cleanup__(ffDestroyTitleOptions))) options;
ffInitTitleOptions(&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 (strcasecmp(key, "fdqn") == 0)
{
options.fdqn = data->ffjson_object_get_boolean(val);
continue;
}
ffPrintErrorString(instance, FF_TITLE_MODULE_NAME, 0, NULL, NULL, "Unknown JSON key %s", key);
}
}
ffPrintTitle(instance, &options);
return true;
}
#endif

14
src/modules/title/title.h Normal file
View File

@ -0,0 +1,14 @@
#pragma once
#include "fastfetch.h"
#include "modules/title/option.h"
void ffPrintTitle(FFinstance* instance, FFTitleOptions* options);
void ffInitTitleOptions(FFTitleOptions* options);
bool ffParseTitleCommandOptions(FFTitleOptions* options, const char* key, const char* value);
void ffDestroyTitleOptions(FFTitleOptions* options);
#ifdef FF_HAVE_JSONC
#include "common/config.h"
bool ffParseTitleJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module);
#endif