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

JsonConfig: support Logo config (WIP)

Browse Source
This commit is contained in:
李通洲
2023-06-10 21:34:41 +08:00
parent abe0d2ca78
commit 6d6eee9968
59 changed files with 224 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/battery/battery.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_BATTERY_MODULE_NAME "Battery"
src/modules/bios/bios.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_BIOS_MODULE_NAME "Bios"
src/modules/bluetooth/bluetooth.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_BLUETOOTH_MODULE_NAME "Bluetooth"
src/modules/board/board.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_BOARD_MODULE_NAME "Board"
src/modules/break/break.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_BREAK_MODULE_NAME "Break"
src/modules/brightness/brightness.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_BRIGHTNESS_MODULE_NAME "Brightness"
src/modules/chassis/chassis.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_CHASSIS_MODULE_NAME "Chassis"
src/modules/colors/colors.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_COLORS_MODULE_NAME "Colors"
src/modules/command/command.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_COMMAND_MODULE_NAME "Command"
src/modules/cpu/cpu.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_CPU_MODULE_NAME "CPU"
src/modules/cpuusage/cpuusage.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_CPUUSAGE_MODULE_NAME "CPUUsage"
src/modules/cursor/cursor.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_CURSOR_MODULE_NAME "Cursor"
src/modules/custom/custom.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_CUSTOM_MODULE_NAME "Custom"
src/modules/datetime/datetime.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_DATETIME_MODULE_NAME "DateTime"
src/modules/de/de.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_DE_MODULE_NAME "DE"
src/modules/disk/disk.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_DISK_MODULE_NAME "Disk"
src/modules/display/display.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_DISPLAY_MODULE_NAME "Display"
src/modules/font/font.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_FONT_MODULE_NAME "Font"
src/modules/gamepad/gamepad.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_GAMEPAD_MODULE_NAME "Gamepad"
src/modules/gpu/gpu.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_GPU_MODULE_NAME "GPU"
src/modules/host/host.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_HOST_MODULE_NAME "Host"
src/modules/icons/icons.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_ICONS_MODULE_NAME "Icons"
src/modules/jsonconfig/jsonconfig.c
+2 -23
View File
@@ -162,30 +162,9 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, yyjson
}
}
static inline void wrapYyjsonFree(yyjson_doc** doc)
{
assert(doc);
if (*doc)
yyjson_doc_free(*doc);
}
static const char* printJsonConfig(FFinstance* instance)
{
FF_STRBUF_AUTO_DESTROY content = ffStrbufCreate();
FF_LIST_FOR_EACH(FFstrbuf, filename, instance->state.platform.configDirs)
{
uint32_t oldLength = filename->length;
ffStrbufAppendS(filename, "fastfetch/config.jsonc");
bool success = ffAppendFileBuffer(filename->chars, &content);
ffStrbufSubstrBefore(filename, oldLength);
if (success) break;
}
yyjson_doc* __attribute__((__cleanup__(wrapYyjsonFree))) doc = yyjson_read_opts(content.chars, content.length, YYJSON_READ_ALLOW_COMMENTS | YYJSON_READ_ALLOW_TRAILING_COMMAS | YYJSON_READ_ALLOW_INF_AND_NAN, NULL, NULL);
if (!doc)
return "Failed to parse JSON config file";
yyjson_val* const root = yyjson_doc_get_root(doc);
yyjson_val* const root = yyjson_doc_get_root(instance->state.configDoc);
assert(root);
if (!yyjson_is_obj(root))
@@ -193,7 +172,7 @@ static const char* printJsonConfig(FFinstance* instance)
yyjson_val* modules = yyjson_obj_get(root, "modules");
if (!modules) return "Property 'modules' is not found";
if (!yyjson_is_arr(modules)) return "modules must be an array of strings or objects";
if (!yyjson_is_arr(modules)) return "Property 'modules' must be an array of strings or objects";
yyjson_val* item;
size_t idx, max;
src/modules/kernel/kernel.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_KERNEL_MODULE_NAME "Kernel"
src/modules/locale/locale.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_LOCALE_MODULE_NAME "Locale"
src/modules/localip/localip.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_LOCALIP_MODULE_NAME "LocalIp"
src/modules/media/media.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_MEDIA_MODULE_NAME "Media"
src/modules/memory/memory.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_MEMORY_MODULE_NAME "Memory"
src/modules/opencl/opencl.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_OPENCL_MODULE_NAME "OpenCL"
src/modules/opengl/opengl.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_OPENGL_MODULE_NAME "OpenGL"
src/modules/os/os.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_OS_MODULE_NAME "OS"
src/modules/packages/packages.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_PACKAGES_MODULE_NAME "Packages"
src/modules/player/player.h
-1
View File
@@ -2,7 +2,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_PLAYER_MODULE_NAME "Player"
src/modules/poweradapter/poweradapter.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_POWERADAPTER_MODULE_NAME "PowerAdapter"
src/modules/processes/processes.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_PROCESSES_MODULE_NAME "Processes"
src/modules/publicip/publicip.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_PUBLICIP_MODULE_NAME "PublicIp"
src/modules/separator/separator.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_SEPARATOR_MODULE_NAME "Separator"
src/modules/shell/shell.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_SHELL_MODULE_NAME "Shell"
src/modules/sound/sound.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_SOUND_MODULE_NAME "Sound"
src/modules/swap/swap.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_SWAP_MODULE_NAME "Swap"
src/modules/terminal/terminal.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_TERMINAL_MODULE_NAME "Terminal"
src/modules/terminalfont/terminalfont.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_TERMINALFONT_MODULE_NAME "TerminalFont"
src/modules/theme/theme.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_THEME_MODULE_NAME "Theme"
src/modules/title/title.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_TITLE_MODULE_NAME "Title"
src/modules/uptime/uptime.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_UPTIME_MODULE_NAME "Uptime"
src/modules/users/users.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_USERS_MODULE_NAME "Users"
src/modules/vulkan/vulkan.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_VULKAN_MODULE_NAME "Vulkan"
src/modules/wallpaper/wallpaper.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_WALLPAPER_MODULE_NAME "Wallpaper"
src/modules/weather/weather.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_WEATHER_MODULE_NAME "Weather"
src/modules/wifi/wifi.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_WIFI_MODULE_NAME "Wifi"
src/modules/wm/wm.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_WM_MODULE_NAME "WM"
src/modules/wmtheme/wmtheme.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include "fastfetch.h"
#include <yyjson.h>
#define FF_WMTHEME_MODULE_NAME "WMTheme"