Skip to content

Commit 154657b

Browse files
committed
NetUsage: rename to NetIO
1 parent 3866f27 commit 154657b

File tree

26 files changed

+102
-102
lines changed

26 files changed

+102
-102
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Features:
2727
* Add `-c` as a shortcut of `--load-config`. Note it was used as the shortcut of `--color` before 2.0.5
2828
* Support Windows Service Pack version detection (Kernel, Windows)
2929
* Support Debian point releases detection (OS, Linux)
30-
* Add new module `NetUsage` which prints network throughput (usage) of specified interface. Note this module costs about 1 second to finish.
30+
* Add new module `NetIO` which prints network throughput (usage) of specified interface. Note this module costs about 1 second to finish.
3131

3232
Bugfixes:
3333
* Fix fastfetch hanging in specific environment (#561)

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ set(LIBFASTFETCH_SRC
278278
src/detection/gpu/gpu.c
279279
src/detection/locale/locale.c
280280
src/detection/media/media.c
281-
src/detection/netusage/netusage.c
281+
src/detection/netio/netio.c
282282
src/detection/opencl/opencl.c
283283
src/detection/os/os.c
284284
src/detection/packages/packages.c
@@ -321,7 +321,7 @@ set(LIBFASTFETCH_SRC
321321
src/modules/localip/localip.c
322322
src/modules/memory/memory.c
323323
src/modules/monitor/monitor.c
324-
src/modules/netusage/netusage.c
324+
src/modules/netio/netio.c
325325
src/modules/opencl/opencl.c
326326
src/modules/opengl/opengl.c
327327
src/modules/os/os.c
@@ -391,7 +391,7 @@ if(LINUX)
391391
src/detection/media/media_linux.c
392392
src/detection/memory/memory_linux.c
393393
src/detection/monitor/monitor_linux.c
394-
src/detection/netusage/netusage_linux.c
394+
src/detection/netio/netio_linux.c
395395
src/detection/opengl/opengl_linux.c
396396
src/detection/os/os_linux.c
397397
src/detection/packages/packages_linux.c
@@ -492,7 +492,7 @@ elseif(BSD)
492492
src/detection/media/media_linux.c
493493
src/detection/memory/memory_bsd.c
494494
src/detection/monitor/monitor_nosupport.c
495-
src/detection/netusage/netusage_bsd.c
495+
src/detection/netio/netio_bsd.c
496496
src/detection/opengl/opengl_linux.c
497497
src/detection/os/os_linux.c
498498
src/detection/packages/packages_linux.c
@@ -541,7 +541,7 @@ elseif(APPLE)
541541
src/detection/media/media_apple.m
542542
src/detection/memory/memory_apple.c
543543
src/detection/monitor/monitor_apple.m
544-
src/detection/netusage/netusage_bsd.c
544+
src/detection/netio/netio_bsd.c
545545
src/detection/opengl/opengl_apple.c
546546
src/detection/os/os_apple.m
547547
src/detection/packages/packages_apple.c
@@ -590,7 +590,7 @@ elseif(WIN32)
590590
src/detection/media/media_nosupport.c
591591
src/detection/memory/memory_windows.c
592592
src/detection/monitor/monitor_windows.c
593-
src/detection/netusage/netusage_windows.c
593+
src/detection/netio/netio_windows.c
594594
src/detection/opengl/opengl_windows.c
595595
src/detection/os/os_windows.cpp
596596
src/detection/packages/packages_windows.c

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ All categories not listed here should work without needing a specific implementa
108108

109109
##### Available Modules
110110
```
111-
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
111+
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
112112
```
113113

114114
##### Builtin logos

doc/json_schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@
558558
"media",
559559
"memory",
560560
"monitor",
561-
"netusage",
561+
"netio",
562562
"opencl",
563563
"opengl",
564564
"os",
@@ -1024,7 +1024,7 @@
10241024
"title": "Network throughput (usage)",
10251025
"properties": {
10261026
"type": {
1027-
"const": "netusage"
1027+
"const": "netio"
10281028
},
10291029
"namePrefix": {
10301030
"title": "Show IPs with given name prefix only",

presets/all

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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
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:NetIO:Version:Break:Colors

presets/all.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"sound",
5252
"gamepad",
5353
"weather",
54-
"netusage",
54+
"netio",
5555
"version",
5656
"break",
5757
"colors"

src/common/commandoption.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ void ffPrepareCommandOption(FFdata* data)
6060
if(ffStrbufContainIgnCaseS(&data->structure, FF_CPUUSAGE_MODULE_NAME))
6161
ffPrepareCPUUsage();
6262

63-
if(ffStrbufContainIgnCaseS(&data->structure, FF_NETUSAGE_MODULE_NAME))
64-
ffPrepareNetUsage(&instance.config.netUsage);
63+
if(ffStrbufContainIgnCaseS(&data->structure, FF_NETIO_MODULE_NAME))
64+
ffPrepareNetIO(&instance.config.netIo);
6565

6666
if(instance.config.multithreading)
6767
{

src/common/init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static void defaultConfig(void)
106106
ffInitMediaOptions(&instance.config.media);
107107
ffInitMemoryOptions(&instance.config.memory);
108108
ffInitMonitorOptions(&instance.config.monitor);
109-
ffInitNetUsageOptions(&instance.config.netUsage);
109+
ffInitNetIOOptions(&instance.config.netIo);
110110
ffInitOSOptions(&instance.config.os);
111111
ffInitOpenCLOptions(&instance.config.openCL);
112112
ffInitOpenGLOptions(&instance.config.openGL);
@@ -320,7 +320,7 @@ static void destroyConfig(void)
320320
ffDestroyMediaOptions(&instance.config.media);
321321
ffDestroyMemoryOptions(&instance.config.memory);
322322
ffDestroyMonitorOptions(&instance.config.monitor);
323-
ffDestroyNetUsageOptions(&instance.config.netUsage);
323+
ffDestroyNetIOOptions(&instance.config.netIo);
324324
ffDestroyOSOptions(&instance.config.os);
325325
ffDestroyOpenCLOptions(&instance.config.openCL);
326326
ffDestroyOpenGLOptions(&instance.config.openGL);

src/common/jsonconfig.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module)
113113
break;
114114
}
115115
case 'n': case 'N': {
116-
if (ffStrEqualsIgnCase(type, FF_NETUSAGE_MODULE_NAME))
116+
if (ffStrEqualsIgnCase(type, FF_NETIO_MODULE_NAME))
117117
{
118-
if (module) ffParseNetUsageJsonObject(&cfg->netUsage, module);
119-
ffPrepareNetUsage(&cfg->netUsage);
118+
if (module) ffParseNetIOJsonObject(&cfg->netIo, module);
119+
ffPrepareNetIO(&cfg->netIo);
120120
}
121121
break;
122122
}

src/common/modules.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static FFModuleBaseInfo* M[] = {
8282
};
8383

8484
static FFModuleBaseInfo* N[] = {
85-
(void*) &instance.config.netUsage,
85+
(void*) &instance.config.netIo,
8686
NULL,
8787
};
8888

0 commit comments

Comments
 (0)