From 154657b455a92f41faef6cc56aa3fb59446f2464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 27 Sep 2023 00:05:37 +0800 Subject: [PATCH] NetUsage: rename to NetIO --- CHANGELOG.md | 2 +- CMakeLists.txt | 12 ++-- README.md | 2 +- doc/json_schema.json | 4 +- presets/all | 2 +- presets/all.jsonc | 2 +- src/common/commandoption.c | 4 +- src/common/init.c | 4 +- src/common/jsonconfig.c | 6 +- src/common/modules.c | 2 +- src/data/config_user.txt | 6 +- src/data/help.txt | 4 +- src/detection/gamepad/gamepad_windows.c | 2 +- .../{netusage/netusage.c => netio/netio.c} | 26 ++++----- .../{netusage/netusage.h => netio/netio.h} | 6 +- .../netusage_bsd.c => netio/netio_bsd.c} | 8 +-- .../netusage_linux.c => netio/netio_linux.c} | 6 +- .../netio_windows.c} | 8 +-- src/fastfetch.c | 4 +- src/fastfetch.h | 2 +- src/modules/modules.h | 2 +- .../{netusage/netusage.c => netio/netio.c} | 56 +++++++++---------- src/modules/netio/netio.h | 14 +++++ src/modules/{netusage => netio}/option.h | 4 +- src/modules/netusage/netusage.h | 14 ----- src/modules/options.h | 2 +- 26 files changed, 102 insertions(+), 102 deletions(-) rename src/detection/{netusage/netusage.c => netio/netio.c} (55%) rename src/detection/{netusage/netusage.h => netio/netio.h} (65%) rename src/detection/{netusage/netusage_bsd.c => netio/netio_bsd.c} (90%) rename src/detection/{netusage/netusage_linux.c => netio/netio_linux.c} (93%) rename src/detection/{netusage/netusage_windows.c => netio/netio_windows.c} (90%) rename src/modules/{netusage/netusage.c => netio/netio.c} (70%) create mode 100644 src/modules/netio/netio.h rename src/modules/{netusage => netio}/option.h (81%) delete mode 100644 src/modules/netusage/netusage.h diff --git a/CHANGELOG.md b/CHANGELOG.md index f133d5449..7c1cc3c75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ Features: * Add `-c` as a shortcut of `--load-config`. Note it was used as the shortcut of `--color` before 2.0.5 * Support Windows Service Pack version detection (Kernel, Windows) * Support Debian point releases detection (OS, Linux) -* Add new module `NetUsage` which prints network throughput (usage) of specified interface. Note this module costs about 1 second to finish. +* Add new module `NetIO` which prints network throughput (usage) of specified interface. Note this module costs about 1 second to finish. Bugfixes: * Fix fastfetch hanging in specific environment (#561) diff --git a/CMakeLists.txt b/CMakeLists.txt index f780c91b9..6b4292475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,7 +278,7 @@ set(LIBFASTFETCH_SRC src/detection/gpu/gpu.c src/detection/locale/locale.c src/detection/media/media.c - src/detection/netusage/netusage.c + src/detection/netio/netio.c src/detection/opencl/opencl.c src/detection/os/os.c src/detection/packages/packages.c @@ -321,7 +321,7 @@ set(LIBFASTFETCH_SRC src/modules/localip/localip.c src/modules/memory/memory.c src/modules/monitor/monitor.c - src/modules/netusage/netusage.c + src/modules/netio/netio.c src/modules/opencl/opencl.c src/modules/opengl/opengl.c src/modules/os/os.c @@ -391,7 +391,7 @@ if(LINUX) src/detection/media/media_linux.c src/detection/memory/memory_linux.c src/detection/monitor/monitor_linux.c - src/detection/netusage/netusage_linux.c + src/detection/netio/netio_linux.c src/detection/opengl/opengl_linux.c src/detection/os/os_linux.c src/detection/packages/packages_linux.c @@ -492,7 +492,7 @@ elseif(BSD) src/detection/media/media_linux.c src/detection/memory/memory_bsd.c src/detection/monitor/monitor_nosupport.c - src/detection/netusage/netusage_bsd.c + src/detection/netio/netio_bsd.c src/detection/opengl/opengl_linux.c src/detection/os/os_linux.c src/detection/packages/packages_linux.c @@ -541,7 +541,7 @@ elseif(APPLE) src/detection/media/media_apple.m src/detection/memory/memory_apple.c src/detection/monitor/monitor_apple.m - src/detection/netusage/netusage_bsd.c + src/detection/netio/netio_bsd.c src/detection/opengl/opengl_apple.c src/detection/os/os_apple.m src/detection/packages/packages_apple.c @@ -590,7 +590,7 @@ elseif(WIN32) src/detection/media/media_nosupport.c src/detection/memory/memory_windows.c src/detection/monitor/monitor_windows.c - src/detection/netusage/netusage_windows.c + src/detection/netio/netio_windows.c src/detection/opengl/opengl_windows.c src/detection/os/os_windows.cpp src/detection/packages/packages_windows.c diff --git a/README.md b/README.md index 5aefedd3a..b38e37b95 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ All categories not listed here should work without needing a specific implementa ##### Available Modules ``` -Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsage, Cursor, Custom, Date, DateTime, DE, Disk, Display, Font, Gamepad, GPU, Host, Icons, Kernel, LM, Locale, LocalIP, Media, Memory, Monitor, NetUsage, OpenCL, OpenGL, OS, Packages, Player, Power Adapter, Processes, PublicIP, Separator, Shell, Sound, Swap, Terminal, Terminal Font, Terminal Size, Theme, Time, Title, Uptime, Version, Vulkan, Wallpaper, Weather, Wifi, WM, WMTheme +Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsage, Cursor, Custom, Date, DateTime, DE, Disk, Display, Font, Gamepad, GPU, Host, Icons, Kernel, LM, Locale, LocalIP, Media, Memory, Monitor, NetIO, OpenCL, OpenGL, OS, Packages, Player, Power Adapter, Processes, PublicIP, Separator, Shell, Sound, Swap, Terminal, Terminal Font, Terminal Size, Theme, Time, Title, Uptime, Version, Vulkan, Wallpaper, Weather, Wifi, WM, WMTheme ``` ##### Builtin logos diff --git a/doc/json_schema.json b/doc/json_schema.json index 7623f0a02..d7e681566 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -558,7 +558,7 @@ "media", "memory", "monitor", - "netusage", + "netio", "opencl", "opengl", "os", @@ -1024,7 +1024,7 @@ "title": "Network throughput (usage)", "properties": { "type": { - "const": "netusage" + "const": "netio" }, "namePrefix": { "title": "Show IPs with given name prefix only", diff --git a/presets/all b/presets/all index 804589d81..b0ed3cab5 100644 --- a/presets/all +++ b/presets/all @@ -1 +1 @@ ---structure Title:Separator:OS:Host:Bios:Board:Chassis:Kernel:Uptime:Processes:Packages:Shell:Display:Brightness:Monitor:LM:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Wallpaper:Terminal:TerminalFont:TerminalSize:CPU:CPUUsage:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Media:PublicIP:LocalIP:Wifi:DateTime:Locale:Vulkan:OpenGL:OpenCL:Users:Bluetooth:Sound:Gamepad:Weather:NetUsage:Version:Break:Colors +--structure Title:Separator:OS:Host:Bios:Board:Chassis:Kernel:Uptime:Processes:Packages:Shell:Display:Brightness:Monitor:LM:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Wallpaper:Terminal:TerminalFont:TerminalSize:CPU:CPUUsage:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Media:PublicIP:LocalIP:Wifi:DateTime:Locale:Vulkan:OpenGL:OpenCL:Users:Bluetooth:Sound:Gamepad:Weather:NetIO:Version:Break:Colors diff --git a/presets/all.jsonc b/presets/all.jsonc index 27c9f6d42..f8d4cc82e 100644 --- a/presets/all.jsonc +++ b/presets/all.jsonc @@ -51,7 +51,7 @@ "sound", "gamepad", "weather", - "netusage", + "netio", "version", "break", "colors" diff --git a/src/common/commandoption.c b/src/common/commandoption.c index 45369a163..e8a7e8001 100644 --- a/src/common/commandoption.c +++ b/src/common/commandoption.c @@ -60,8 +60,8 @@ void ffPrepareCommandOption(FFdata* data) if(ffStrbufContainIgnCaseS(&data->structure, FF_CPUUSAGE_MODULE_NAME)) ffPrepareCPUUsage(); - if(ffStrbufContainIgnCaseS(&data->structure, FF_NETUSAGE_MODULE_NAME)) - ffPrepareNetUsage(&instance.config.netUsage); + if(ffStrbufContainIgnCaseS(&data->structure, FF_NETIO_MODULE_NAME)) + ffPrepareNetIO(&instance.config.netIo); if(instance.config.multithreading) { diff --git a/src/common/init.c b/src/common/init.c index 490e4d0b5..35f1467fc 100644 --- a/src/common/init.c +++ b/src/common/init.c @@ -106,7 +106,7 @@ static void defaultConfig(void) ffInitMediaOptions(&instance.config.media); ffInitMemoryOptions(&instance.config.memory); ffInitMonitorOptions(&instance.config.monitor); - ffInitNetUsageOptions(&instance.config.netUsage); + ffInitNetIOOptions(&instance.config.netIo); ffInitOSOptions(&instance.config.os); ffInitOpenCLOptions(&instance.config.openCL); ffInitOpenGLOptions(&instance.config.openGL); @@ -320,7 +320,7 @@ static void destroyConfig(void) ffDestroyMediaOptions(&instance.config.media); ffDestroyMemoryOptions(&instance.config.memory); ffDestroyMonitorOptions(&instance.config.monitor); - ffDestroyNetUsageOptions(&instance.config.netUsage); + ffDestroyNetIOOptions(&instance.config.netIo); ffDestroyOSOptions(&instance.config.os); ffDestroyOpenCLOptions(&instance.config.openCL); ffDestroyOpenGLOptions(&instance.config.openGL); diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c index 5d6027f4a..6d8fee329 100644 --- a/src/common/jsonconfig.c +++ b/src/common/jsonconfig.c @@ -113,10 +113,10 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) break; } case 'n': case 'N': { - if (ffStrEqualsIgnCase(type, FF_NETUSAGE_MODULE_NAME)) + if (ffStrEqualsIgnCase(type, FF_NETIO_MODULE_NAME)) { - if (module) ffParseNetUsageJsonObject(&cfg->netUsage, module); - ffPrepareNetUsage(&cfg->netUsage); + if (module) ffParseNetIOJsonObject(&cfg->netIo, module); + ffPrepareNetIO(&cfg->netIo); } break; } diff --git a/src/common/modules.c b/src/common/modules.c index b83588992..420903c8e 100644 --- a/src/common/modules.c +++ b/src/common/modules.c @@ -82,7 +82,7 @@ static FFModuleBaseInfo* M[] = { }; static FFModuleBaseInfo* N[] = { - (void*) &instance.config.netUsage, + (void*) &instance.config.netIo, NULL, }; diff --git a/src/data/config_user.txt b/src/data/config_user.txt index aed51c723..c8a257ec5 100644 --- a/src/data/config_user.txt +++ b/src/data/config_user.txt @@ -370,7 +370,7 @@ #--lm-key LM #--locale-key Locale #--localip-key Local IP ({1}) -#--netusage-key Net Usage ({1}) +#--netio-key Network IO ({1}) #--publicip-key Public IP #--wifi-key Wifi #--weather-key Weather @@ -423,7 +423,7 @@ #--lm-format #--locale-format #--localip-format -#--netusage-format +#--netio-format #--publicip-format #--weather-format #--monitor-format @@ -473,7 +473,7 @@ #--lm-key-color #--locale-key-color #--localip-key-color -#--netusage-key-color +#--netio-key-color #--publicip-key-color #--weather-key-color #--monitor-key-color diff --git a/src/data/help.txt b/src/data/help.txt index 36617c00a..94ba7f617 100644 --- a/src/data/help.txt +++ b/src/data/help.txt @@ -150,8 +150,8 @@ Module specific options: --localip-name-prefix : Show interfaces with given interface name prefix only. Default is empty --localip-default-route-only : Show the interface that is used for default routing only. Default is false --localip-compact : Show all IPs in one line. Default is false - --netusage-name-prefix : Show interfaces with given name prefix only. Default is empty - --netusage-default-route-only : Show the interfac that is used for default routing only. Default is false + --netio-name-prefix : Show interfaces with given name prefix only. Default is empty + --netio-default-route-only : Show the interfac that is used for default routing only. Default is false --publicip-timeout: Time in milliseconds to wait for the public ip server to respond. Default is disabled (0) --publicip-url: The URL of public IP detection server to be used. --weather-location: Set the location to be used. It must be URI encoded (eg a whitespace must be encoded as `+`). diff --git a/src/detection/gamepad/gamepad_windows.c b/src/detection/gamepad/gamepad_windows.c index e115782aa..8a5799717 100644 --- a/src/detection/gamepad/gamepad_windows.c +++ b/src/detection/gamepad/gamepad_windows.c @@ -130,7 +130,7 @@ const char* ffDetectGamepad(FFlist* devices /* List of FFGamepadDevice */) if (hHidFile && HidD_GetProductString(hHidFile, displayName, sizeof(wchar_t) * 126)) ffStrbufSetWS(&device->name, displayName); else - ffStrbufSetF(&device->name, "Unknown gamepad %4X-%4X", rdi.hid.dwVendorId, rdi.hid.dwProductId); + ffStrbufSetF(&device->name, "Unknown gamepad %4X-%4X", (unsigned) rdi.hid.dwVendorId, (unsigned) rdi.hid.dwProductId); } } diff --git a/src/detection/netusage/netusage.c b/src/detection/netio/netio.c similarity index 55% rename from src/detection/netusage/netusage.c rename to src/detection/netio/netio.c index 88888c28a..5a07af8e2 100644 --- a/src/detection/netusage/netusage.c +++ b/src/detection/netio/netio.c @@ -1,26 +1,26 @@ -#include "netusage.h" +#include "netio.h" #include "common/time.h" -const char* ffNetUsageGetIoCounters(FFlist* result, FFNetUsageOptions* options); +const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options); static FFlist ioCounters1; static uint64_t time1; -void ffPrepareNetUsage(FFNetUsageOptions* options) +void ffPrepareNetIO(FFNetIOOptions* options) { - ffListInit(&ioCounters1, sizeof(FFNetUsageIoCounters)); - ffNetUsageGetIoCounters(&ioCounters1, options); + ffListInit(&ioCounters1, sizeof(FFNetIOResult)); + ffNetIOGetIoCounters(&ioCounters1, options); time1 = ffTimeGetNow(); } -const char* ffDetectNetUsage(FFlist* result, FFNetUsageOptions* options) +const char* ffDetectNetIO(FFlist* result, FFNetIOOptions* options) { const char* error = NULL; if (time1 == 0) { - ffListInit(&ioCounters1, sizeof(FFNetUsageIoCounters)); - error = ffNetUsageGetIoCounters(&ioCounters1, options); + ffListInit(&ioCounters1, sizeof(FFNetIOResult)); + error = ffNetIOGetIoCounters(&ioCounters1, options); if (error) return error; time1 = ffTimeGetNow(); @@ -36,7 +36,7 @@ const char* ffDetectNetUsage(FFlist* result, FFNetUsageOptions* options) time2 = ffTimeGetNow(); } - error = ffNetUsageGetIoCounters(result, options); + error = ffNetIOGetIoCounters(result, options); if (error) return error; @@ -45,13 +45,13 @@ const char* ffDetectNetUsage(FFlist* result, FFNetUsageOptions* options) for (uint32_t i = 0; i < result->length; ++i) { - FFNetUsageIoCounters* icPrev = (FFNetUsageIoCounters*)ffListGet(&ioCounters1, i); - FFNetUsageIoCounters* icCurr = (FFNetUsageIoCounters*)ffListGet(result, i); + FFNetIOResult* icPrev = (FFNetIOResult*)ffListGet(&ioCounters1, i); + FFNetIOResult* icCurr = (FFNetIOResult*)ffListGet(result, i); if (!ffStrbufEqual(&icPrev->name, &icCurr->name)) return "Network interface name changed"; - static_assert(sizeof(FFNetUsageIoCounters) - offsetof(FFNetUsageIoCounters, txBytes) == sizeof(uint64_t) * 8, "Unexpected struct FFNetUsageIoCounters layout"); - for (size_t off = offsetof(FFNetUsageIoCounters, txBytes); off < sizeof(FFNetUsageIoCounters); off += sizeof(uint64_t)) + static_assert(sizeof(FFNetIOResult) - offsetof(FFNetIOResult, txBytes) == sizeof(uint64_t) * 8, "Unexpected struct FFNetIOResult layout"); + for (size_t off = offsetof(FFNetIOResult, txBytes); off < sizeof(FFNetIOResult); off += sizeof(uint64_t)) { uint64_t* prevValue = (uint64_t*) ((uint8_t*) icPrev + off); uint64_t* currValue = (uint64_t*) ((uint8_t*) icCurr + off); diff --git a/src/detection/netusage/netusage.h b/src/detection/netio/netio.h similarity index 65% rename from src/detection/netusage/netusage.h rename to src/detection/netio/netio.h index bb6234ee1..295c4478e 100644 --- a/src/detection/netusage/netusage.h +++ b/src/detection/netio/netio.h @@ -1,6 +1,6 @@ #include "fastfetch.h" -typedef struct FFNetUsageIoCounters +typedef struct FFNetIOResult { FFstrbuf name; bool defaultRoute; @@ -12,6 +12,6 @@ typedef struct FFNetUsageIoCounters uint64_t txErrors; uint64_t rxDrops; uint64_t txDrops; -} FFNetUsageIoCounters; +} FFNetIOResult; -const char* ffDetectNetUsage(FFlist* result, FFNetUsageOptions* options); +const char* ffDetectNetIO(FFlist* result, FFNetIOOptions* options); diff --git a/src/detection/netusage/netusage_bsd.c b/src/detection/netio/netio_bsd.c similarity index 90% rename from src/detection/netusage/netusage_bsd.c rename to src/detection/netio/netio_bsd.c index b5fd61083..a0c764dbd 100644 --- a/src/detection/netusage/netusage_bsd.c +++ b/src/detection/netio/netio_bsd.c @@ -1,4 +1,4 @@ -#include "netusage.h" +#include "netio.h" #include "common/io/io.h" #include "common/netif/netif.h" @@ -12,7 +12,7 @@ #include #include -const char* ffNetUsageGetIoCounters(FFlist* result, FFNetUsageOptions* options) +const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) { size_t bufSize = 0; if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, 0 }, 6, NULL, &bufSize, 0, 0) < 0) @@ -43,8 +43,8 @@ const char* ffNetUsageGetIoCounters(FFlist* result, FFNetUsageOptions* options) if (options->namePrefix.length && strncmp(sdl->sdl_data, options->namePrefix.chars, options->namePrefix.length) != 0) continue; - FFNetUsageIoCounters* counters = (FFNetUsageIoCounters*) ffListAdd(result); - *counters = (FFNetUsageIoCounters) { + FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result); + *counters = (FFNetIOResult) { .name = ffStrbufCreateNS(sdl->sdl_nlen, sdl->sdl_data), .txBytes = ifm->ifm_data.ifi_obytes, .rxBytes = ifm->ifm_data.ifi_ibytes, diff --git a/src/detection/netusage/netusage_linux.c b/src/detection/netio/netio_linux.c similarity index 93% rename from src/detection/netusage/netusage_linux.c rename to src/detection/netio/netio_linux.c index a5d64be5b..4b5565cbc 100644 --- a/src/detection/netusage/netusage_linux.c +++ b/src/detection/netio/netio_linux.c @@ -1,4 +1,4 @@ -#include "netusage.h" +#include "netio.h" #include "common/io/io.h" #include "common/netif/netif.h" @@ -6,7 +6,7 @@ #include -const char* ffNetUsageGetIoCounters(FFlist* result, FFNetUsageOptions* options) +const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) { FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/net"); if (!dirp) return "opendir(\"/sys/class/net\") == NULL"; @@ -33,7 +33,7 @@ const char* ffNetUsageGetIoCounters(FFlist* result, FFNetUsageOptions* options) if(!ffReadFileBuffer(path.chars, &buffer) || !ffStrbufEqualS(&buffer, "up")) continue; - FFNetUsageIoCounters* counters = (FFNetUsageIoCounters*) ffListAdd(result); + FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result); ffStrbufInitS(&counters->name, entry->d_name); counters->defaultRoute = isDefaultRoute; diff --git a/src/detection/netusage/netusage_windows.c b/src/detection/netio/netio_windows.c similarity index 90% rename from src/detection/netusage/netusage_windows.c rename to src/detection/netio/netio_windows.c index b9d45f3e7..526e01707 100644 --- a/src/detection/netusage/netusage_windows.c +++ b/src/detection/netio/netio_windows.c @@ -1,4 +1,4 @@ -#include "netusage.h" +#include "netio.h" #include "common/netif/netif.h" #include "util/mallocHelper.h" @@ -7,7 +7,7 @@ #include #include -const char* ffNetUsageGetIoCounters(FFlist* result, FFNetUsageOptions* options) +const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) { IP_ADAPTER_ADDRESSES* FF_AUTO_FREE adapter_addresses = NULL; @@ -54,8 +54,8 @@ const char* ffNetUsageGetIoCounters(FFlist* result, FFNetUsageOptions* options) MIB_IF_ROW2 ifRow = { .InterfaceIndex = adapter->IfIndex }; if (GetIfEntry2(&ifRow) == NO_ERROR) { - FFNetUsageIoCounters* counters = (FFNetUsageIoCounters*) ffListAdd(result); - *counters = (FFNetUsageIoCounters) { + FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result); + *counters = (FFNetIOResult) { .name = ffStrbufCreateS(name), .txBytes = ifRow.OutOctets, .rxBytes = ifRow.InOctets, diff --git a/src/fastfetch.c b/src/fastfetch.c index bdd2fdf52..c956357eb 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -397,9 +397,9 @@ static inline void printCommandHelp(const char* command) "Public IP address" ); } - else if(ffStrEqualsIgnCase(command, "netusage-format")) + else if(ffStrEqualsIgnCase(command, "netio-format")) { - constructAndPrintCommandHelpFormat("netusage", "{}", 3, + constructAndPrintCommandHelpFormat("netio", "{}", 3, "Size of data received per second (formatted)", "Size of data sent per second (formatted)", "Interface name", diff --git a/src/fastfetch.h b/src/fastfetch.h index ccf3a8f10..0877c1088 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -112,7 +112,7 @@ typedef struct FFconfig FFMediaOptions media; FFMemoryOptions memory; FFMonitorOptions monitor; - FFNetUsageOptions netUsage; + FFNetIOOptions netIo; FFOSOptions os; FFOpenCLOptions openCL; FFOpenGLOptions openGL; diff --git a/src/modules/modules.h b/src/modules/modules.h index 2ab14bc60..64ab6ea21 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -31,7 +31,7 @@ #include "modules/media/media.h" #include "modules/memory/memory.h" #include "modules/monitor/monitor.h" -#include "modules/netusage/netusage.h" +#include "modules/netio/netio.h" #include "modules/opengl/opengl.h" #include "modules/opencl/opencl.h" #include "modules/os/os.h" diff --git a/src/modules/netusage/netusage.c b/src/modules/netio/netio.c similarity index 70% rename from src/modules/netusage/netusage.c rename to src/modules/netio/netio.c index 2ae67a704..3efef948f 100644 --- a/src/modules/netusage/netusage.c +++ b/src/modules/netio/netio.c @@ -1,26 +1,26 @@ #include "common/printing.h" #include "common/jsonconfig.h" #include "common/parsing.h" -#include "detection/netusage/netusage.h" -#include "modules/netusage/netusage.h" +#include "detection/netio/netio.h" +#include "modules/netio/netio.h" #include "util/stringUtils.h" -#define FF_NETUSAGE_DISPLAY_NAME "Net Usage" -#define FF_NETUSAGE_NUM_FORMAT_ARGS 12 +#define FF_NETIO_DISPLAY_NAME "Network IO" +#define FF_NETIO_NUM_FORMAT_ARGS 12 -static int sortInfs(const FFNetUsageIoCounters* left, const FFNetUsageIoCounters* right) +static int sortInfs(const FFNetIOResult* left, const FFNetIOResult* right) { return ffStrbufComp(&left->name, &right->name); } -static void formatKey(const FFNetUsageOptions* options, FFNetUsageIoCounters* inf, uint32_t index, FFstrbuf* key) +static void formatKey(const FFNetIOOptions* options, FFNetIOResult* inf, uint32_t index, FFstrbuf* key) { if(options->moduleArgs.key.length == 0) { if(!inf->name.length) ffStrbufSetF(&inf->name, "unknown %u", (unsigned) index); - ffStrbufSetF(key, FF_NETUSAGE_DISPLAY_NAME " (%s)", inf->name.chars); + ffStrbufSetF(key, FF_NETIO_DISPLAY_NAME " (%s)", inf->name.chars); } else { @@ -32,14 +32,14 @@ static void formatKey(const FFNetUsageOptions* options, FFNetUsageIoCounters* in } } -void ffPrintNetUsage(FFNetUsageOptions* options) +void ffPrintNetIO(FFNetIOOptions* options) { - FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFNetUsageIoCounters)); - const char* error = ffDetectNetUsage(&result, options); + FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFNetIOResult)); + const char* error = ffDetectNetIO(&result, options); if(error) { - ffPrintError(FF_NETUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, "%s", error); + ffPrintError(FF_NETIO_DISPLAY_NAME, 0, &options->moduleArgs, "%s", error); return; } @@ -50,7 +50,7 @@ void ffPrintNetUsage(FFNetUsageOptions* options) FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate(); FF_STRBUF_AUTO_DESTROY buffer2 = ffStrbufCreate(); - FF_LIST_FOR_EACH(FFNetUsageIoCounters, inf, result) + FF_LIST_FOR_EACH(FFNetIOResult, inf, result) { formatKey(options, inf, result.length == 1 ? 0 : index + 1, &key); ffStrbufClear(&buffer); @@ -60,9 +60,9 @@ void ffPrintNetUsage(FFNetUsageOptions* options) ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT); ffParseSize(inf->rxBytes, &buffer); - ffStrbufAppendS(&buffer, "/s (in) - "); + ffStrbufAppendS(&buffer, "/s (IN) - "); ffParseSize(inf->txBytes, &buffer); - ffStrbufAppendS(&buffer, "/s (out)"); + ffStrbufAppendS(&buffer, "/s (OUT)"); if (!options->defaultRouteOnly && inf->defaultRoute) ffStrbufAppendS(&buffer, " *"); ffStrbufPutTo(&buffer, stdout); @@ -75,7 +75,7 @@ void ffPrintNetUsage(FFNetUsageOptions* options) ffParseSize(inf->txBytes, &buffer2); ffStrbufAppendS(&buffer2, "/s"); - ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_NETUSAGE_NUM_FORMAT_ARGS, (FFformatarg[]){ + ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_NETIO_NUM_FORMAT_ARGS, (FFformatarg[]){ {FF_FORMAT_ARG_TYPE_STRBUF, &buffer}, {FF_FORMAT_ARG_TYPE_STRBUF, &buffer2}, {FF_FORMAT_ARG_TYPE_STRBUF, &inf->name}, @@ -93,24 +93,24 @@ void ffPrintNetUsage(FFNetUsageOptions* options) ++index; } - FF_LIST_FOR_EACH(FFNetUsageIoCounters, inf, result) + FF_LIST_FOR_EACH(FFNetIOResult, inf, result) { ffStrbufDestroy(&inf->name); } } -void ffInitNetUsageOptions(FFNetUsageOptions* options) +void ffInitNetIOOptions(FFNetIOOptions* options) { - ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_NETUSAGE_MODULE_NAME, ffParseNetUsageCommandOptions, ffParseNetUsageJsonObject, ffPrintNetUsage, ffGenerateNetUsageJson); + ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_NETIO_MODULE_NAME, ffParseNetIOCommandOptions, ffParseNetIOJsonObject, ffPrintNetIO, ffGenerateNetIOJson); ffOptionInitModuleArg(&options->moduleArgs); ffStrbufInit(&options->namePrefix); options->defaultRouteOnly = false; } -bool ffParseNetUsageCommandOptions(FFNetUsageOptions* options, const char* key, const char* value) +bool ffParseNetIOCommandOptions(FFNetIOOptions* options, const char* key, const char* value) { - const char* subKey = ffOptionTestPrefix(key, FF_NETUSAGE_MODULE_NAME); + const char* subKey = ffOptionTestPrefix(key, FF_NETIO_MODULE_NAME); if (!subKey) return false; if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs)) return true; @@ -130,13 +130,13 @@ bool ffParseNetUsageCommandOptions(FFNetUsageOptions* options, const char* key, return false; } -void ffDestroyNetUsageOptions(FFNetUsageOptions* options) +void ffDestroyNetIOOptions(FFNetIOOptions* options) { ffOptionDestroyModuleArg(&options->moduleArgs); ffStrbufDestroy(&options->namePrefix); } -void ffParseNetUsageJsonObject(FFNetUsageOptions* options, yyjson_val* module) +void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module) { yyjson_val *key_, *val; size_t idx, max; @@ -161,14 +161,14 @@ void ffParseNetUsageJsonObject(FFNetUsageOptions* options, yyjson_val* module) continue; } - ffPrintError(FF_NETUSAGE_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); + ffPrintError(FF_NETIO_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key); } } -void ffGenerateNetUsageJson(FFNetUsageOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) +void ffGenerateNetIOJson(FFNetIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module) { - FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFNetUsageIoCounters)); - const char* error = ffDetectNetUsage(&result, options); + FF_LIST_AUTO_DESTROY result = ffListCreate(sizeof(FFNetIOResult)); + const char* error = ffDetectNetIO(&result, options); if(error) { @@ -177,7 +177,7 @@ void ffGenerateNetUsageJson(FFNetUsageOptions* options, yyjson_mut_doc* doc, yyj } yyjson_mut_val* arr = yyjson_mut_obj_add_arr(doc, module, "result"); - FF_LIST_FOR_EACH(FFNetUsageIoCounters, counter, result) + FF_LIST_FOR_EACH(FFNetIOResult, counter, result) { yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr); yyjson_mut_obj_add_strbuf(doc, obj, "name", &counter->name); @@ -192,7 +192,7 @@ void ffGenerateNetUsageJson(FFNetUsageOptions* options, yyjson_mut_doc* doc, yyj yyjson_mut_obj_add_uint(doc, obj, "txDrops", counter->txDrops); } - FF_LIST_FOR_EACH(FFNetUsageIoCounters, inf, result) + FF_LIST_FOR_EACH(FFNetIOResult, inf, result) { ffStrbufDestroy(&inf->name); } diff --git a/src/modules/netio/netio.h b/src/modules/netio/netio.h new file mode 100644 index 000000000..3562d0ccd --- /dev/null +++ b/src/modules/netio/netio.h @@ -0,0 +1,14 @@ +#pragma once + +#include "fastfetch.h" + +#define FF_NETIO_MODULE_NAME "NetIO" + +void ffPrepareNetIO(FFNetIOOptions* options); + +void ffPrintNetIO(FFNetIOOptions* options); +void ffInitNetIOOptions(FFNetIOOptions* options); +bool ffParseNetIOCommandOptions(FFNetIOOptions* options, const char* key, const char* value); +void ffDestroyNetIOOptions(FFNetIOOptions* options); +void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module); +void ffGenerateNetIOJson(FFNetIOOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); diff --git a/src/modules/netusage/option.h b/src/modules/netio/option.h similarity index 81% rename from src/modules/netusage/option.h rename to src/modules/netio/option.h index ff436aaf2..62b493d29 100644 --- a/src/modules/netusage/option.h +++ b/src/modules/netio/option.h @@ -4,11 +4,11 @@ #include "common/option.h" -typedef struct FFNetUsageOptions +typedef struct FFNetIOOptions { FFModuleBaseInfo moduleInfo; FFModuleArgs moduleArgs; FFstrbuf namePrefix; bool defaultRouteOnly; -} FFNetUsageOptions; +} FFNetIOOptions; diff --git a/src/modules/netusage/netusage.h b/src/modules/netusage/netusage.h deleted file mode 100644 index 4feaee10a..000000000 --- a/src/modules/netusage/netusage.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "fastfetch.h" - -#define FF_NETUSAGE_MODULE_NAME "NetUsage" - -void ffPrepareNetUsage(FFNetUsageOptions* options); - -void ffPrintNetUsage(FFNetUsageOptions* options); -void ffInitNetUsageOptions(FFNetUsageOptions* options); -bool ffParseNetUsageCommandOptions(FFNetUsageOptions* options, const char* key, const char* value); -void ffDestroyNetUsageOptions(FFNetUsageOptions* options); -void ffParseNetUsageJsonObject(FFNetUsageOptions* options, yyjson_val* module); -void ffGenerateNetUsageJson(FFNetUsageOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module); diff --git a/src/modules/options.h b/src/modules/options.h index 77c6cf855..1be2e88e0 100644 --- a/src/modules/options.h +++ b/src/modules/options.h @@ -31,7 +31,7 @@ #include "modules/media/option.h" #include "modules/memory/option.h" #include "modules/monitor/option.h" -#include "modules/netusage/option.h" +#include "modules/netio/option.h" #include "modules/opengl/option.h" #include "modules/opencl/option.h" #include "modules/os/option.h"