Skip to content

Commit e0f8a46

Browse files
Caellianclaude
Caellian
and
claude
committed
refactor(parse): migrate network variables to registry
Move addr, addrs, v6addrs, downspeed, downspeedf, downspeedgraph, upspeed, upspeedf, upspeedgraph, totaldown, totalup, nameserver, all wireless_* variables, and if_up from core.cc to distributed registration in net_stat.cc. Inline all trivial print callbacks as non-capturing lambdas. Add net_hr_var<Member> factory for human_readable net_stat field access. Delete 20+ named print functions (print_downspeed, print_wireless_*, print_nameserver, etc.) — logic inlined into registration lambdas. Clean up net_stat.h: remove all print/parse/free declarations now internal to net_stat.cc. Keep only struct definitions, get_net_stat, clear_net_stats, and update_dns_data needed by other modules. Remove net_stat.h include from core.cc. Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
1 parent 4b18813 commit e0f8a46

3 files changed

Lines changed: 181 additions & 296 deletions

File tree

‎src/core.cc‎

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
#endif /* BUILD_ICONV */
7070
#include "data/network/mail.h"
7171
#include "data/network/mboxscan.h"
72-
#include "data/network/net_stat.h"
7372
#include "logging.h"
7473
#include "lua/llua.h"
7574
#include "output/nc.h"
@@ -226,47 +225,6 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
226225

227226
#endif /* __linux__ */
228227

229-
#ifdef BUILD_WLAN
230-
END OBJ(wireless_essid, &update_net_stats) obj->data.opaque =
231-
get_net_stat(arg, obj, free_at_crash);
232-
parse_net_stat_arg(obj, arg, free_at_crash);
233-
obj->callbacks.print = &print_wireless_essid;
234-
END OBJ(wireless_channel, &update_net_stats)
235-
parse_net_stat_arg(obj, arg, free_at_crash);
236-
obj->callbacks.print = &print_wireless_channel;
237-
END OBJ(wireless_freq, &update_net_stats)
238-
parse_net_stat_arg(obj, arg, free_at_crash);
239-
obj->callbacks.print = &print_wireless_frequency;
240-
END OBJ(wireless_mode, &update_net_stats)
241-
parse_net_stat_arg(obj, arg, free_at_crash);
242-
obj->callbacks.print = &print_wireless_mode;
243-
END OBJ(wireless_bitrate, &update_net_stats)
244-
parse_net_stat_arg(obj, arg, free_at_crash);
245-
obj->callbacks.print = &print_wireless_bitrate;
246-
END OBJ(wireless_ap, &update_net_stats)
247-
parse_net_stat_arg(obj, arg, free_at_crash);
248-
obj->callbacks.print = &print_wireless_ap;
249-
END OBJ(wireless_link_qual, &update_net_stats)
250-
parse_net_stat_arg(obj, arg, free_at_crash);
251-
obj->callbacks.print = &print_wireless_link_qual;
252-
END OBJ(wireless_link_qual_max, &update_net_stats)
253-
parse_net_stat_arg(obj, arg, free_at_crash);
254-
obj->callbacks.print = &print_wireless_link_qual_max;
255-
END OBJ(wireless_link_qual_perc, &update_net_stats)
256-
parse_net_stat_arg(obj, arg, free_at_crash);
257-
obj->callbacks.print = &print_wireless_link_qual_perc;
258-
END OBJ(wireless_link_bar, &update_net_stats)
259-
parse_net_stat_bar_arg(obj, arg, free_at_crash);
260-
obj->callbacks.barval = &wireless_link_barval;
261-
#endif /* BUILD_WLAN */
262-
263-
#if (defined(__FreeBSD__) || defined(__linux__) || defined(__DragonFly__) || \
264-
(defined(__APPLE__) && defined(__MACH__)))
265-
END OBJ_IF_ARG(if_up, nullptr, "if_up needs an argument")
266-
parse_if_up_arg(obj, arg);
267-
obj->callbacks.iftest = &interface_up;
268-
obj->callbacks.free = &free_if_up;
269-
#endif
270228
#if defined(__OpenBSD__)
271229
END OBJ_ARG(obsd_sensors_temp, 0, "obsd_sensors_temp: needs an argument")
272230
parse_obsd_sensor(obj, arg);
@@ -333,17 +291,6 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
333291
#endif /* BUILD_GUI */
334292
END OBJ(conky_version, nullptr) obj_be_plain_text(obj, VERSION);
335293
END OBJ(conky_build_arch, nullptr) obj_be_plain_text(obj, BUILD_ARCH);
336-
END OBJ(downspeed, &update_net_stats)
337-
parse_net_stat_arg(obj, arg, free_at_crash);
338-
obj->callbacks.print = &print_downspeed;
339-
END OBJ(downspeedf, &update_net_stats)
340-
parse_net_stat_arg(obj, arg, free_at_crash);
341-
obj->callbacks.print = &print_downspeedf;
342-
#ifdef BUILD_GUI
343-
END OBJ(downspeedgraph, &update_net_stats)
344-
parse_net_stat_graph_arg(obj, arg, free_at_crash);
345-
obj->callbacks.graphval = &downspeedgraphval;
346-
#endif /* BUILD_GUI */
347294
END OBJ(else, nullptr) obj_be_ifblock_else(ifblock_opaque, obj);
348295
obj->callbacks.iftest = &gen_false_iftest;
349296
END OBJ(endif, nullptr) obj_be_ifblock_endif(ifblock_opaque, obj);
@@ -483,9 +430,6 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
483430
arg != nullptr ? strtol(arg, nullptr, 10) : 1;
484431
obj->callbacks.print = &new_hr;
485432
#endif /* BUILD_GUI */
486-
END OBJ(nameserver, &update_dns_data) parse_nameserver_arg(obj, arg);
487-
obj->callbacks.print = &print_nameserver;
488-
obj->callbacks.free = &free_dns_data;
489433
END OBJ(offset, nullptr) obj->data.l =
490434
arg != nullptr ? strtol(arg, nullptr, 10) : 1;
491435
obj->callbacks.print = &new_offset;
@@ -502,20 +446,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
502446
END OBJ(tab, nullptr) scan_tab(obj, arg);
503447
obj->callbacks.print = &new_tab;
504448
#endif /* BUILD_GUI */
505-
END OBJ(addr, &update_net_stats) parse_net_stat_arg(obj, arg, free_at_crash);
506-
obj->callbacks.print = &print_addr;
507-
END
508-
#ifdef __linux__
509-
OBJ(addrs, &update_net_stats) parse_net_stat_arg(obj, arg, free_at_crash);
510-
obj->callbacks.print = &print_addrs;
511-
#ifdef BUILD_IPV6
512-
END OBJ(v6addrs, &update_net_stats)
513-
parse_net_stat_arg(obj, arg, free_at_crash);
514-
obj->callbacks.print = &print_v6addrs;
515-
#endif /* BUILD_IPV6 */
516-
END
517-
#endif /* __linux__ */
518-
OBJ_ARG(tail, nullptr, "tail needs arguments")
449+
END OBJ_ARG(tail, nullptr, "tail needs arguments")
519450
init_tailhead("tail", arg, obj, free_at_crash);
520451
obj->callbacks.print = &print_tail;
521452
obj->callbacks.free = &free_tailhead;
@@ -648,29 +579,12 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
648579
END OBJ(iconv_stop, 0) init_iconv_stop();
649580
obj->callbacks.print = &print_iconv_stop;
650581
#endif
651-
END OBJ(totaldown, &update_net_stats)
652-
parse_net_stat_arg(obj, arg, free_at_crash);
653-
obj->callbacks.print = &print_totaldown;
654-
END OBJ(totalup, &update_net_stats)
655-
parse_net_stat_arg(obj, arg, free_at_crash);
656-
obj->callbacks.print = &print_totalup;
657582
END OBJ(alignr, nullptr) obj->data.l =
658583
arg != nullptr ? strtol(arg, nullptr, 10) : 1;
659584
obj->callbacks.print = &new_alignr;
660585
END OBJ(alignc, nullptr) obj->data.l =
661586
arg != nullptr ? strtol(arg, nullptr, 10) : 0;
662587
obj->callbacks.print = &new_alignc;
663-
END OBJ(upspeed, &update_net_stats)
664-
parse_net_stat_arg(obj, arg, free_at_crash);
665-
obj->callbacks.print = &print_upspeed;
666-
END OBJ(upspeedf, &update_net_stats)
667-
parse_net_stat_arg(obj, arg, free_at_crash);
668-
obj->callbacks.print = &print_upspeedf;
669-
#ifdef BUILD_GUI
670-
END OBJ(upspeedgraph, &update_net_stats)
671-
parse_net_stat_graph_arg(obj, arg, free_at_crash);
672-
obj->callbacks.graphval = &upspeedgraphval;
673-
#endif
674588
#if defined(__linux__)
675589
END OBJ(user_names, &update_users) obj->callbacks.print = &print_user_names;
676590
obj->callbacks.free = &free_user_names;

0 commit comments

Comments
 (0)