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

Modules: major code refactor

Browse Source 
Also fix some bugs found when refactoring
This commit is contained in:
李通洲
2023-08-17 10:56:54 +08:00
parent 75323d64f8
commit c888254f70
171 changed files with 778 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/theme/option.h
+1 -1
View File
@@ -6,6 +6,6 @@
typedef struct FFThemeOptions
{
const char* moduleName;
FFModuleBaseInfo moduleInfo;
FFModuleArgs moduleArgs;
} FFThemeOptions;
src/modules/theme/theme.c
+4 -9
View File
@@ -32,7 +32,7 @@ void ffPrintTheme(FFThemeOptions* options)
void ffInitThemeOptions(FFThemeOptions* options)
{
options->moduleName = FF_THEME_MODULE_NAME;
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_THEME_MODULE_NAME, ffParseThemeCommandOptions, ffParseThemeJsonObject, ffPrintTheme);
ffOptionInitModuleArg(&options->moduleArgs);
}
@@ -51,11 +51,8 @@ void ffDestroyThemeOptions(FFThemeOptions* options)
ffOptionDestroyModuleArg(&options->moduleArgs);
}
void ffParseThemeJsonObject(yyjson_val* module)
void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module)
{
FFThemeOptions __attribute__((__cleanup__(ffDestroyThemeOptions))) options;
ffInitThemeOptions(&options);
if (module)
{
yyjson_val *key_, *val;
@@ -66,12 +63,10 @@ void ffParseThemeJsonObject(yyjson_val* module)
if(ffStrEqualsIgnCase(key, "type"))
continue;
if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
continue;
ffPrintError(FF_THEME_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
ffPrintError(FF_THEME_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
}
}
ffPrintTheme(&options);
}
src/modules/theme/theme.h
+1 -1
View File
@@ -8,4 +8,4 @@ void ffPrintTheme(FFThemeOptions* options);
void ffInitThemeOptions(FFThemeOptions* options);
bool ffParseThemeCommandOptions(FFThemeOptions* options, const char* key, const char* value);
void ffDestroyThemeOptions(FFThemeOptions* options);
void ffParseThemeJsonObject(yyjson_val* module);
void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module);