diff --git a/CMakeLists.txt b/CMakeLists.txt index d423e07f6..920f98d72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,7 +266,7 @@ set(LIBFASTFETCH_SRC src/modules/bluetooth/bluetooth.c src/modules/board/board.c src/modules/brightness.c - src/modules/break.c + src/modules/break/break.c src/modules/chassis.c src/modules/colors.c src/modules/cpu.c diff --git a/src/fastfetch.h b/src/fastfetch.h index bd6e4ee72..16975ef34 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -250,7 +250,6 @@ void ffPrepareWeather(FFinstance* instance); //Printing void ffPrintCustom(FFinstance* instance, const char* key, const char* value); -void ffPrintBreak(FFinstance* instance); void ffPrintChassis(FFinstance* instance); void ffPrintUptime(FFinstance* instance); void ffPrintProcesses(FFinstance* instance); diff --git a/src/modules/break.c b/src/modules/break.c deleted file mode 100644 index 45b09e5fd..000000000 --- a/src/modules/break.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "fastfetch.h" -#include "common/printing.h" - -void ffPrintBreak(FFinstance* instance) -{ - ffLogoPrintLine(instance); - putchar('\n'); -} diff --git a/src/modules/break/break.c b/src/modules/break/break.c new file mode 100644 index 000000000..05587a6fd --- /dev/null +++ b/src/modules/break/break.c @@ -0,0 +1,22 @@ +#include "fastfetch.h" +#include "common/printing.h" +#include "modules/break/break.h" + +#define FF_BREAK_MODULE_NAME "Break" + +void ffPrintBreak(FFinstance* instance) +{ + ffLogoPrintLine(instance); + putchar('\n'); +} + +#ifdef FF_HAVE_JSONC +bool ffParseBreakJsonObject(FFinstance* instance, const char* type, FF_MAYBE_UNUSED JSONCData* data, FF_MAYBE_UNUSED json_object* module) +{ + if (strcasecmp(type, FF_BREAK_MODULE_NAME) != 0) + return false; + + ffPrintBreak(instance); + return true; +} +#endif diff --git a/src/modules/break/break.h b/src/modules/break/break.h new file mode 100644 index 000000000..81e40f5c8 --- /dev/null +++ b/src/modules/break/break.h @@ -0,0 +1,10 @@ +#pragma once + +#include "fastfetch.h" + +void ffPrintBreak(FFinstance* instance); + +#ifdef FF_HAVE_JSONC +#include "common/config.h" +bool ffParseBreakJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module); +#endif diff --git a/src/modules/jsonconfig/jsonconfig.c b/src/modules/jsonconfig/jsonconfig.c index 221c1050a..30c0f2451 100644 --- a/src/modules/jsonconfig/jsonconfig.c +++ b/src/modules/jsonconfig/jsonconfig.c @@ -17,6 +17,7 @@ static inline bool parseModuleJsonObject(FFinstance* instance, const char* type, ffParseBiosJsonObject(instance, type, data, module) || ffParseBluetoothJsonObject(instance, type, data, module) || ffParseBoardJsonObject(instance, type, data, module) || + ffParseBreakJsonObject(instance, type, data, module) || ffParseCommandJsonObject(instance, type, data, module) || ffParseDateTimeJsonObject(instance, type, data, module) || ffParseDisplayJsonObject(instance, type, data, module) || diff --git a/src/modules/modules.h b/src/modules/modules.h index 846b18b08..bd5a75acf 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -7,6 +7,7 @@ #include "modules/bios/bios.h" #include "modules/bluetooth/bluetooth.h" #include "modules/board/board.h" +#include "modules/break/break.h" #include "modules/command/command.h" #include "modules/datetime/datetime.h" #include "modules/display/display.h"